diff --git a/megamek/src/megamek/client/ui/swing/ClientGUI.java b/megamek/src/megamek/client/ui/swing/ClientGUI.java
index b3894b7028b..c9d9c18664b 100644
--- a/megamek/src/megamek/client/ui/swing/ClientGUI.java
+++ b/megamek/src/megamek/client/ui/swing/ClientGUI.java
@@ -1839,6 +1839,7 @@ public void doAlertDialog(String title, String message, int msgTyoe) {
     public boolean doYesNoDialog(String title, String question) {
         ConfirmDialog confirm = new ConfirmDialog(frame, title, question);
         confirm.setVisible(true);
+        confirm.setAlwaysOnTop(true);
         return confirm.getAnswer();
     }
 
@@ -2282,8 +2283,7 @@ public void gameEnd(GameEndEvent e) {
 
             // Allow players to save their living units to a file.
             // Don't bother asking if none survived.
-            if (!living.isEmpty()
-                    && doYesNoDialog(Messages.getString("ClientGUI.SaveUnitsDialog.title"),
+            if (doYesNoDialog(Messages.getString("ClientGUI.SaveUnitsDialog.title"),
                             Messages.getString("ClientGUI.SaveUnitsDialog.message"))) {
                 // Allow the player to save the units to a file.
                 saveVictoryList();