2 files changed, 18 insertions, 6 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 00256fcbe..cf853966d 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -569,6 +569,7 @@ void PopupMenu::showOutfitsWindowPopup(const int x, const int y)
 {
     mX = x;
     mY = y;
+    mWindow = outfitWindow;
 
     mBrowserBox->clearRows();
 
@@ -578,6 +579,10 @@ void PopupMenu::showOutfitsWindowPopup(const int x, const int y)
     // TRANSLATORS: clear selected outfit
     mBrowserBox->addRow("clear outfit", _("Clear outfit"));
     mBrowserBox->addRow("##3---");
+
+    addWindowMenu(outfitWindow);
+    mBrowserBox->addRow("##3---");
+
     // TRANSLATORS: popup menu item
     // TRANSLATORS: close menu
     mBrowserBox->addRow("cancel", _("Cancel"));
@@ -860,6 +865,17 @@ void PopupMenu::showWindowPopup(Window *const window,
     // TRANSLATORS: popup menu header
     mBrowserBox->addRow(_("window"));
 
+    addWindowMenu(window);
+
+    // TRANSLATORS: popup menu item
+    // TRANSLATORS: close menu
+    mBrowserBox->addRow("cancel", _("Cancel"));
+
+    showPopup(x, y);
+}
+
+void PopupMenu::addWindowMenu(Window *const window)
+{
     if (window->getCloseButton())
     {
         // TRANSLATORS: popup menu item
@@ -882,12 +898,6 @@ void PopupMenu::showWindowPopup(Window *const window,
             mBrowserBox->addRow("window lock", _("Lock"));
         }
     }
-
-    // TRANSLATORS: popup menu item
-    // TRANSLATORS: close menu
-    mBrowserBox->addRow("cancel", _("Cancel"));
-
-    showPopup(x, y);
 }
 
 void PopupMenu::handleLink(const std::string &link,
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 6a991c9e8..fe9d0855e 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -172,6 +172,8 @@ class PopupMenu final : public Popup, public LinkHandler
 
         void addNormalRelations();
 
+        void addWindowMenu(Window *const window);
+
         void showGMPopup();
 
         BrowserBox *mBrowserBox;