diff --git a/src/servers/app/WorkspacesLayer.cpp b/src/servers/app/WorkspacesLayer.cpp
index df24b23d55..90b12ddbe6 100644
--- a/src/servers/app/WorkspacesLayer.cpp
+++ b/src/servers/app/WorkspacesLayer.cpp
@@ -410,11 +410,11 @@ WorkspacesLayer::MouseDown(BMessage* message, BPoint where)
 	}
 
 	// If this window is movable, we keep it selected
+	// (we prevent our own window from being moved, too)
 
 	if (fSelectedWindow != NULL && (fSelectedWindow->Flags() & B_NOT_MOVABLE) != 0
 		|| fSelectedWindow == Window()) {
 		fSelectedWindow = NULL;
-		index = -1;
 	}
 
 	fLeftTopOffset = where - windowFrame.LeftTop();