diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 37fcd74cb3..90aac62cae 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1224,7 +1224,7 @@ BMenu::RemoveItems(int32 index, int32 count, BMenuItem *_item, bool del)
 	}	
 	
 	InvalidateLayout();
-	
+		
 	return result;
 }
 
@@ -1336,9 +1336,11 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
 	if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) {
 		if (Parent())
 			*width = Parent()->Frame().Width() + 1;
-		else
+		else if (Window())
 			*width = Window()->Frame().Width() + 1;
 		
+		// TODO: We are left without a valid width here ?!?
+		
 		*height = frame.Height();
 	} else {
 		*width = frame.Width();