diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 8f59f8e1..8d24e8dd 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1692,6 +1692,10 @@ void CCompositor::warpCursorTo(const Vector2D& pos) {
         return;
 
     wlr_cursor_warp(m_sWLRCursor, m_sSeat.mouse->mouse, pos.x, pos.y);
+
+    const auto PMONITORNEW = getMonitorFromVector(pos);
+    if (PMONITORNEW != m_pLastMonitor)
+        m_pLastMonitor = PMONITORNEW;
 }
 
 SLayerSurface* CCompositor::getLayerSurfaceFromWlr(wlr_layer_surface_v1* pLS) {
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 0ce15781..9371d7fd 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1351,8 +1351,6 @@ void CKeybindManager::focusWindow(std::string regexp) {
 
     Debug::log(LOG, "Focusing to window name: %s", PWINDOW->m_szTitle.c_str());
 
-    changeworkspace("[internal]" + std::to_string(PWINDOW->m_iWorkspaceID));
-
     g_pCompositor->focusWindow(PWINDOW);
 
     const auto MIDPOINT = PWINDOW->m_vRealPosition.goalv() + PWINDOW->m_vRealSize.goalv() / 2.f;