diff --git a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java
index 13aa9398c6..b5744d0483 100644
--- a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java
+++ b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java
@@ -49,7 +49,6 @@
 import megamek.client.ui.swing.CommonSettingsDialog;
 import megamek.client.ui.swing.dialog.DialogButton;
 import megamek.client.ui.swing.util.ClickableLabel;
-import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.Configuration;
 import megamek.common.annotations.Nullable;
 import megamek.common.preference.PreferenceManager;
@@ -91,10 +90,12 @@ public ScenarioChooser(final JFrame parentFrame) {
             return scenarioFileName;
         }
         Component selectedTab = tabbedPane.getSelectedComponent();
-        if (!(selectedTab instanceof ScenarioInfoPane) || !getResult().isConfirmed()) {
+        if (!(selectedTab instanceof ScenarioInfoPane selectedPane) || !getResult().isConfirmed()) {
             return null;
+        } else if (selectedPane.getSelectedPreset() != null) {
+            return selectedPane.getSelectedPreset().getFileName();
         } else {
-            return ((ScenarioInfoPane) selectedTab).getSelectedPreset().getFileName();
+            return null;
         }
     }