diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
index f4bf419f504..1886192f224 100644
--- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
+++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
@@ -3,6 +3,7 @@ package forge.view;
 import java.io.File;
 import java.util.*;
 
+import forge.properties.ForgeConstants;
 import forge.util.storage.IStorage;
 import org.apache.commons.lang3.text.WordUtils;
 import org.apache.commons.lang3.time.StopWatch;
@@ -176,8 +177,11 @@ public class SimulateMatch {
 
     private static Deck deckFromCommandLineParameter(String deckname, GameType type) {
         int dotpos = deckname.lastIndexOf('.');
-        if(dotpos > 0 && dotpos == deckname.length()-4)
-            return DeckSerializer.fromFile(new File(deckname));
+        if(dotpos > 0 && dotpos == deckname.length()-4) {
+            String baseDir = type.equals(GameType.Commander) ?
+                    ForgeConstants.DECK_COMMANDER_DIR : ForgeConstants.DECK_CONSTRUCTED_DIR;
+            return DeckSerializer.fromFile(new File(baseDir+deckname));
+        }
 
         IStorage<Deck> deckStore = null;