diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 9c54d50f0..0c7bb89da 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -646,7 +646,10 @@ class EditDeck(QMainWindow):
         saveHeader(self.dialog.tableView.horizontalHeader(), "editor")
         self.hide()
         ui.dialogs.close("CardList")
-        self.parent.moveToState("auto")
+        if self.parent.currentCard:
+            self.parent.moveToState("showQuestion")
+        else:
+            self.parent.moveToState("auto")
         self.teardownHooks()
         return True
 
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 053c2ef99..88d2b3768 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -332,6 +332,8 @@ Please do not file a bug report with Anki.<br>""")
             self.editor.saveFieldsNow()
             self.mainWin.buttonStack.show()
             self.deck.refresh()
+            if self.currentCard.priority == 0:
+                return self.moveToState("auto")
             return self.moveToState("showQuestion")
         elif state == "studyScreen":
             self.currentCard = None