diff --git a/src/focuschain.cpp b/src/focuschain.cpp
index dd36127019..5d62223f26 100644
--- a/src/focuschain.cpp
+++ b/src/focuschain.cpp
@@ -139,6 +139,9 @@ void FocusChain::moveAfterWindow(Window *window, Window *reference)
     if (!window->wantsTabFocus()) {
         return;
     }
+    if (reference == window) {
+        return;
+    }
 
     for (auto it = m_desktopFocusChains.begin();
          it != m_desktopFocusChains.end();
@@ -159,6 +162,9 @@ void FocusChain::moveBeforeWindow(Window *window, Window *reference)
     if (!window->wantsTabFocus()) {
         return;
     }
+    if (reference == window) {
+        return;
+    }
 
     for (auto it = m_desktopFocusChains.begin();
          it != m_desktopFocusChains.end();