diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 1569550381..9a899e75c7 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -955,6 +955,11 @@ Desktop::SetFocusWindow(WindowLayer* focus)
 		focus = focus->PreviousWindow(fCurrentWorkspace);
 	}
 
+	if (fFocus == focus) {
+		// turns out the window that is supposed to get focus now already has it
+		UnlockAllWindows();
+	}
+
 	ServerApp* oldActiveApp = NULL;
 	ServerApp* newActiveApp = NULL;