diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 5e516010c2..54570a43f0 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1606,7 +1606,7 @@ BMenu::MenuWindow()
 	if (fCachedMenuWindow == NULL) {
 		char windowName[64];
 		snprintf(windowName, 64, "%s cached menu", Name());
-		fCachedMenuWindow = new BMenuWindow(windowName, this);
+		fCachedMenuWindow = new BMenuWindow(windowName, NULL);
 	}
 
 	return fCachedMenuWindow;
diff --git a/src/kits/interface/MenuWindow.cpp b/src/kits/interface/MenuWindow.cpp
index ba2c910e5f..ed18883ed2 100644
--- a/src/kits/interface/MenuWindow.cpp
+++ b/src/kits/interface/MenuWindow.cpp
@@ -38,7 +38,8 @@ BMenuWindow::BMenuWindow(const char *name, BMenu *menu)
 	fUpperScroller(NULL),
 	fLowerScroller(NULL)
 {
-	SetMenu(menu);
+	if (menu != NULL)
+		SetMenu(menu);
 }