more edit current fixes

aqt/editcurrent.py

@@ -28,11 +28,15 @@ class EditCurrent(QDialog):
         restoreGeom(self, "editcurrent")
         self.mw.requireReset()
         self.open()
+        # reset focus after open
+        self.editor.web.setFocus()
 
     def onSave(self):
         self.editor.saveNow()
         self.editor.setFact(None)
-        self.mw.reviewer.card.load()
-        self.mw.reviewer.show(keep=True)
+        r = self.mw.reviewer
+        r.card.load()
+        r.keep = True
+        self.mw.moveToState("review")
         saveGeom(self, "editcurrent")
         self.close()

aqt/reviewer.py

@@ -22,16 +22,18 @@ class Reviewer(object):
         self.cardQueue = []
         self._answeredIds = []
         self.state = None
+        self.keep = False
         self._setupStatus()
         addHook("leech", self.onLeech)
 
-    def show(self, keep=False):
+    def show(self):
         self.web.setKeyHandler(self._keyHandler)
         self.web.setLinkHandler(self._linkHandler)
-        if keep:
+        if self.keep:
             self._initWeb()
         else:
             self.nextCard()
+        self.keep = False
 
     def lastCard(self):
         if self._answeredIds: