diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 8cc7559845..a9b90a3321 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1270,6 +1270,8 @@ Desktop::HideWindow(WindowLayer* window)
 		return;
 
 	window->SetHidden(true);
+	if (fMouseEventWindow == window)
+		fMouseEventWindow = NULL;
 
 	if (window->InWorkspace(fCurrentWorkspace)) {
 		_UpdateSubsetWorkspaces(window);