diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 37472c01ea6..bc59af96387 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -836,9 +836,7 @@ public class FDeckChooser extends FScreen {
     }
 
     private void testCommanderDeck(final Deck userDeck) {
-        FDeckChooser aiDeckPrompt = new FDeckChooser(GameType.Commander, true, null);
-        aiDeckPrompt.setHeaderCaption("Select Opponent's Deck");
-        aiDeckPrompt.callback = new Callback<Deck>() {
+        promptForDeck("Select Opponent's Deck", GameType.Commander, true, new Callback<Deck>() {
             @Override
             public void run(final Deck aiDeck) {
                 if (aiDeck == null) { return; }
@@ -865,7 +863,6 @@ public class FDeckChooser extends FScreen {
                     }
                 });
             }
-        };
-        Forge.openScreen(aiDeckPrompt);
+        });
     }
 }
diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
index ac4061fc576..24e65da96cf 100644
--- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
@@ -2,6 +2,7 @@ package forge.screens.home;
 
 import java.util.ArrayList;
 
+import forge.Forge;
 import forge.screens.FScreen;
 import forge.assets.FSkinImage;
 import forge.deck.FDeckChooser;
@@ -20,6 +21,7 @@ public class HomeScreen extends FScreen {
 
     private final FLabel lblLogo = add(new FLabel.Builder().icon(FSkinImage.LOGO).iconInBackground().iconScaleFactor(1).build());
     private final ArrayList<FButton> buttons = new ArrayList<FButton>();
+    private FDeckChooser deckManager;
 
     public HomeScreen() {
         super((Header)null);
@@ -45,7 +47,11 @@ public class HomeScreen extends FScreen {
         addButton("Deck Manager", new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                FDeckChooser.promptForDeck("Deck Manager", GameType.DeckManager, false, null);
+                if (deckManager == null) {
+                    deckManager = new FDeckChooser(GameType.DeckManager, false, null);
+                    deckManager.setHeaderCaption("Deck Manager");
+                }
+                Forge.openScreen(deckManager);
             }
         });
         addButton("Achievements", new FEventHandler() {