From c0f4e9f52e1839a69ae3fa9994754f8c27a0db9d Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sat, 22 Apr 2023 21:13:02 +0100
Subject: [PATCH] internal: moveToWorkspace before setting ws

---
 src/Compositor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 6e0f7baa2..33042d2b2 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2327,6 +2327,9 @@ void CCompositor::moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorks
     if (FULLSCREEN)
         setWindowFullscreen(pWindow, false, FULLSCREEN_FULL);
 
+    pWindow->moveToWorkspace(pWorkspace->m_iID);
+    pWindow->updateToplevel();
+
     if (!pWindow->m_bIsFloating) {
         g_pLayoutManager->getCurrentLayout()->onWindowRemovedTiling(pWindow);
         pWindow->m_iWorkspaceID = pWorkspace->m_iID;
@@ -2344,9 +2347,6 @@ void CCompositor::moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorks
         pWindow->m_vRealPosition = POSTOMON + PWORKSPACEMONITOR->vecPosition;
     }
 
-    pWindow->moveToWorkspace(pWorkspace->m_iID);
-    pWindow->updateToplevel();
-
     if (FULLSCREEN)
         setWindowFullscreen(pWindow, true, FULLSCREEN_FULL);
 }