1 files changed, 3 insertions, 2 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index e92eced..ce61a4d 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -365,9 +365,10 @@ void FocusControl::removeClient(WinClient &client) {
     m_focused_list.remove(&client);
     m_creation_order_list.remove(&client);
 
-    if (cyc == &client)
+    if (cyc == &client) {
+        m_cycling_window = m_creation_order_list.end();
         stopCyclingFocus();
-
+    }
 }
 
 /**