diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index aa1f847e11..606f19b0ae 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -1913,6 +1913,9 @@ RootLayer::show_winBorder(WinBorder *winBorder)
 				winBorder->Level() == B_FLOATING_APP))
 		{
 			invalid = fWorkspace[i]->ShowWinBorder(winBorder);
+
+			// ToDo: this won't work with FFM
+			fWorkspace[i]->SetFocus(winBorder);
 		}
 
 		if (fActiveWksIndex == i) {