diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index a4914a983e..6d8a6560ae 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1538,8 +1538,13 @@ Desktop::ActivateWindow(Window* window)
 	if (window->IsMinimized()) {
 		// Unlike WindowAction(), this is called from the application itself,
 		// so we will just unminimize the window here.
-		ShowWindow(window);
 		window->SetMinimized(false);
+		UnlockAllWindows();
+
+		ShowWindow(window);
+
+		if (!LockAllWindows())
+			return;
 	}
 
 	if (window == FrontWindow()) {