diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp
index 693613387f..304722a0b6 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -1079,6 +1079,8 @@ void
 TExpandoMenuBar::_DoneTracking(BPoint point)
 {
 	TTeamMenuItem* lastItem = dynamic_cast<TTeamMenuItem*>(fLastClickedItem);
+	if (lastItem == NULL)
+		return;
 
 	if (!lastItem->ExpanderBounds().Contains(point))
 		return;
@@ -1096,6 +1098,8 @@ void
 TExpandoMenuBar::_Track(BPoint point, uint32)
 {
 	TTeamMenuItem* lastItem = dynamic_cast<TTeamMenuItem*>(fLastClickedItem);
+	if (lastItem == NULL)
+		return;
 
 	if (lastItem->ExpanderBounds().Contains(point))
 		lastItem->SetArrowDirection(BControlLook::B_RIGHT_DOWN_ARROW);