diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 261dd9b5d2..88c1cf7bad 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -760,7 +760,8 @@ Desktop::SetLastMouseState(const BPoint& position, int32 buttons,
 
 	if (fLastMouseButtons == 0 && fLockedFocusWindow) {
 		fLockedFocusWindow = NULL;
-		SetFocusWindow(windowUnderMouse);
+		if (fSettings->FocusFollowsMouse())
+			SetFocusWindow(windowUnderMouse);
 	}
 }