2 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 80f14042b0b7..300ecf535980 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2727,7 +2727,7 @@ int MenuBar::GetMenuBarHeight() const
 // bool PopupMenu::bAnyPopupInExecute = false;
 
 MenuFloatingWindow * PopupMenu::ImplGetFloatingWindow() const {
-    return static_cast<MenuFloatingWindow *>(Menu::GetWindow());
+    return static_cast<MenuFloatingWindow*>(GetWindow());
 }
 
 PopupMenu::PopupMenu()
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 64fba7d7a4f6..0d6a60689c35 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -482,9 +482,11 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly )
     if ( !pActivePopup || ( pThisOnly && ( pThisOnly != pActivePopup ) ) )
         return;
 
-    if (pActivePopup->m_pWindow)
-        if (static_cast<FloatingWindow *>(pActivePopup->m_pWindow.get())->IsInCleanUp())
+    if (MenuFloatingWindow* pFloatWin = pActivePopup->ImplGetFloatingWindow())
+    {
+        if (pFloatWin->IsInCleanUp())
             return; // kill it later
+    }
     if ( pActivePopup->bInCallback )
         pActivePopup->bCanceled = true;