diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp
index fb98ae85..bb8fbe0a 100644
--- a/src/events/Monitors.cpp
+++ b/src/events/Monitors.cpp
@@ -97,6 +97,7 @@ void Events::listener_newOutput(wl_listener* listener, void* data) {
 
     // add a WLR workspace group
     PNEWMONITOR->pWLRWorkspaceGroupHandle = wlr_ext_workspace_group_handle_v1_create(g_pCompositor->m_sWLREXTWorkspaceMgr);
+    wlr_ext_workspace_group_handle_v1_output_enter(PNEWMONITOR->pWLRWorkspaceGroupHandle, PNEWMONITOR->output);
 
     // Workspace
     const auto WORKSPACEID = monitorRule.defaultWorkspaceID == -1 ? g_pCompositor->m_lWorkspaces.size() + 1 /* Cuz workspaces doesnt have the new one yet and we start with 1 */ : monitorRule.defaultWorkspaceID;
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index 2ba9dc06..6647aaeb 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -37,14 +37,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
 
     const auto PMONITOR = g_pCompositor->getMonitorFromCursor();
     if (PMONITOR && PMONITOR != g_pCompositor->m_pLastMonitor) {
-        // update wlr workspaces when this happens
-        if (g_pCompositor->m_pLastMonitor)
-            wlr_ext_workspace_group_handle_v1_output_leave(g_pCompositor->m_pLastMonitor->pWLRWorkspaceGroupHandle, g_pCompositor->m_pLastMonitor->output);
-
         g_pCompositor->m_pLastMonitor = PMONITOR;
 
-        wlr_ext_workspace_group_handle_v1_output_enter(PMONITOR->pWLRWorkspaceGroupHandle, PMONITOR->output);
-
         // set active workspace and deactivate all other in wlr
         g_pCompositor->deactivateAllWLRWorkspaces(g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_pWlrHandle);
         wlr_ext_workspace_handle_v1_set_active(g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_pWlrHandle, true);