diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp
index 4764d1b9aa..5b246a62fe 100644
--- a/src/preferences/keymap/KeyboardLayoutView.cpp
+++ b/src/preferences/keymap/KeyboardLayoutView.cpp
@@ -478,6 +478,7 @@ KeyboardLayoutView::MessageReceived(BMessage* message)
 		_InvalidateKey(fDropTarget);
 		fDropTarget = NULL;
 		fDropPoint.x = -1;
+		return;
 	}
 
 	switch (message->what) {