diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 25984777a..710c93b2c 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -333,6 +333,8 @@ class FactEditor(object):
 
     def saveFieldsNow(self):
         "Must call this before adding cards, closing dialog, etc."
+        if not self.fact:
+            return
         # disable timer
         if self.changeTimer:
             self.changeTimer.stop()
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 70436182b..5f4f9775f 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1361,6 +1361,7 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
         self.mainWin.actionRepeatQuestionAudio.setEnabled(False)
         self.mainWin.actionRepeatAnswerAudio.setEnabled(False)
         self.mainWin.actionRepeatAudio.setEnabled(False)
+        self.mainWin.actionEditCurrent.setEnabled(False)
 
     def enableCardMenuItems(self):
         self.mainWin.actionUndoAnswer.setEnabled(not not self.lastCard)
@@ -1373,6 +1374,7 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
         self.mainWin.actionRepeatAudio.setEnabled(
             self.mainWin.actionRepeatQuestionAudio.isEnabled() or
             self.mainWin.actionRepeatAnswerAudio.isEnabled())
+        self.mainWin.actionEditCurrent.setEnabled(True)
 
     # Auto update
     ##########################################################################