diff --git a/src/ui/App.swift b/src/ui/App.swift
index ed6eda40..9d4a422e 100644
--- a/src/ui/App.swift
+++ b/src/ui/App.swift
@@ -226,7 +226,8 @@ class App: AppCenterApplication, NSApplicationDelegate {
                 let stepWithClosestWindow = Windows.windowIndexAfterCycling(-1) > Windows.focusedWindowIndex ? 1 : -1
                 Windows.cycleFocusedWindowIndex(stepWithClosestWindow)
             } else {
-                Windows.updatesWindowSpace(window)
+                Spaces.refreshAllIdsAndIndexes()
+                window.updatesWindowSpace()
             }
         }
     }