diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
index 6e4340d13ac..f51b9a51897 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
@@ -328,7 +328,11 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
     }
 
     public void refreshDeckListForAI(){
+        //remember current deck by name, refresh decklist for AI/Human then reselect if possible
+        String currentName= lstDecks.getSelectedItem().getName();
         refreshDecksList(selectedDeckType,true,null);
+        lstDecks.setSelectedString(currentName);
+        saveState();
     }
 
     private void refreshDecksList(final DeckType deckType, final boolean forceRefresh, final DecksComboBoxEvent ev) {
diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 44ccdf0ae2d..85e2ec895d0 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -531,7 +531,11 @@ public class FDeckChooser extends FScreen {
     }
 
     public void refreshDeckListForAI(){
+        //remember current deck by name, refresh decklist for AI/Human then reselect if possible
+        String currentName= lstDecks.getSelectedItem().getName();
         refreshDecksList(selectedDeckType,true,null);
+        lstDecks.setSelectedString(currentName);
+        saveState();
     }
 
     private void refreshDecksList(DeckType deckType, boolean forceRefresh, FEvent e) {