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