diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index cb67af2f..b02d63a7 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -85,8 +85,10 @@ void Events::listener_mapWindow(void* owner, void* data) {
 
                 Debug::log(LOG, "HL_INITIAL_WORKSPACE_TOKEN {} -> {}", SZTOKEN, WS);
 
-                requestedWorkspace = WS;
-                workspaceSilent    = true;
+                if (g_pCompositor->getWorkspaceByString(WS) != PWINDOW->m_pWorkspace) {
+                    requestedWorkspace = WS;
+                    workspaceSilent    = true;
+                }
             }
         }
     }