diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 938ff55650..d0d192ebef 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1476,6 +1476,9 @@ Desktop::SetWindowFeel(WindowLayer *window, window_feel newFeel)
 	}
 
 	_UpdateFronts();
+
+	if (window == FocusWindow() && !window->IsVisible())
+		SetFocusWindow(FrontWindow());
 }