diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 7ce5ac335f..ffcd4dc01d 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -818,35 +818,17 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
 			break;
 		}
 		case B_UNMAPPED_KEY_DOWN:
-		{
-			if (fFocus)
-				fFocus->MessageReceived( msg );
-			else
-				BLooper::DispatchMessage(msg, target);
-			break;
-		}
 		case B_UNMAPPED_KEY_UP:
-		{
-			if (fFocus)
-				fFocus->MessageReceived( msg );
-			else
-				BLooper::DispatchMessage(msg, target);
-			break;
-		}
 		case B_MODIFIERS_CHANGED:
 		{
 			if (fFocus)
 				fFocus->MessageReceived( msg );
-			else
-				BLooper::DispatchMessage(msg, target);
 			break;
 		}
 		case B_MOUSE_WHEEL_CHANGED:
 		{
 			if (fFocus)
 				fFocus->MessageReceived( msg );
-			else
-				BLooper::DispatchMessage(msg, target);
 			break;
 		}
 		case B_MOUSE_DOWN: