diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 5b1809a94f..c4f6c2f920 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -3236,11 +3236,10 @@ Desktop::_SetWorkspace(int32 index)
 		delete region;
 	}
 
-	// Set new focus to the front window, but keep focus to a floating
-	// window if still visible
+	// Set new focus, but keep focus to a floating window if still visible
 	if (!_Windows(index).HasWindow(FocusWindow())
 		|| !FocusWindow()->IsFloating())
-		SetFocusWindow(FrontWindow());
+		SetFocusWindow();
 
 	_WindowChanged(NULL);
 	MarkDirty(dirty);