diff --git a/aqt/editcurrent.py b/aqt/editcurrent.py
index 4cc3aaebd..6db195d8c 100644
--- a/aqt/editcurrent.py
+++ b/aqt/editcurrent.py
@@ -37,6 +37,8 @@ class EditCurrent(QDialog):
         r = self.mw.reviewer
         r.card.load()
         r.keep = True
+        # we don't need to reset the deck, but there may be new groups
+        self.mw.deck.sched._resetConf()
         self.mw.moveToState("review")
         saveGeom(self, "editcurrent")
         self.close()
diff --git a/aqt/main.py b/aqt/main.py
index e02076d40..1ee23b9bd 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -27,6 +27,9 @@ config = aqt.config
 
 ## fixme: open plugin folder broken on win32?
 
+## fixme: new deck, cloze & cardlayout, gets stuck in resetRequired state
+## models remembering the previous group
+
 class AnkiQt(QMainWindow):
     def __init__(self, app, config, args, splash):
         QMainWindow.__init__(self)