diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index d6cf00be..87869da1 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -185,9 +185,10 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
         } else {
             pFoundWindow = g_pCompositor->vectorToWindowIdeal(mouseCoords);
 
-            if (refocus && !pFoundWindow) {
-                pFoundWindow = g_pCompositor->getFirstWindowOnWorkspace(PMONITOR->activeWorkspace);
-            }
+            // TODO: this causes crashes, sometimes. ???
+           // if (refocus && !pFoundWindow) {
+           //     pFoundWindow = g_pCompositor->getFirstWindowOnWorkspace(PMONITOR->activeWorkspace);
+           // }
         }
 
         if (pFoundWindow) {