diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index c2a9e26141..4e913035bb 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -113,14 +113,15 @@ BarViewMessageFilter::Filter(BMessage* message, BHandler** target)
 		switch (message->what) {
 			case B_MOUSE_DOWN:
 				fBarView->MouseDown(where);
-			break;
+				break;
 
 			case B_MOUSE_MOVED:
 				fBarView->MouseMoved(where, transit, dragMessage);
-			break;
+				break;
 		}
 
-		delete dragMessage;
+		if (message->HasMessage("be:drag_message"))
+			delete dragMessage;
 	}
 
 	return B_DISPATCH_MESSAGE;