diff --git a/src/kits/interface/MenuBar.cpp b/src/kits/interface/MenuBar.cpp
index 11b1d1c1fb..12edb86645 100644
--- a/src/kits/interface/MenuBar.cpp
+++ b/src/kits/interface/MenuBar.cpp
@@ -478,7 +478,7 @@ BMenuBar::RestoreFocus()
 		if (BPrivate::gDefaultTokens.GetToken(fPrevFocusToken, B_HANDLER_TOKEN,
 				(void **)&handler, NULL) == B_OK) {
 			BView *view = dynamic_cast<BView *>(handler);
-			if (view != NULL)
+			if (view != NULL && view->Window() == window)
 				view->MakeFocus();
 		}
 		fPrevFocusToken = -1;
@@ -486,6 +486,7 @@ BMenuBar::RestoreFocus()
 	}
 }
 
+
 void 
 BMenuBar::InitData(menu_layout layout)
 {