diff --git a/megamek/data/images/hexes/minimap/defaultminimap.theme b/megamek/data/images/hexes/minimap/default.theme
similarity index 100%
rename from megamek/data/images/hexes/minimap/defaultminimap.theme
rename to megamek/data/images/hexes/minimap/default.theme
diff --git a/megamek/src/megamek/client/ui/swing/CommonSettingsDialog.java b/megamek/src/megamek/client/ui/swing/CommonSettingsDialog.java
index a5501aaeb9c..4ae5ba1c49f 100644
--- a/megamek/src/megamek/client/ui/swing/CommonSettingsDialog.java
+++ b/megamek/src/megamek/client/ui/swing/CommonSettingsDialog.java
@@ -2070,7 +2070,7 @@ public void setVisible(boolean visible) {
                 }
             }
 
-            minimapTheme.setSelectedItem(CLIENT_PREFERENCES.getMinimapTheme());
+            minimapTheme.setSelectedItem(CLIENT_PREFERENCES.getMinimapTheme().getName());
 
             gameSummaryBV.setSelected(GUIP.getGameSummaryBoardView());
             gameSummaryMM.setSelected(GUIP.getGameSummaryMinimap());