diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 5292d7d0a..f6be15af7 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -818,6 +818,9 @@ where id in (%s)""" % ",".join([
         except:
             # card has been deleted
             return
+        # ensure the change timer doesn't fire after deletion but before reset
+        self.editor.saveFieldsNow()
+        self.editor.fact = None
         self.dialog.tableView.setFocus()
         self.deck.setUndoStart(n)
         self.deck.deleteCards(cards)
diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 8e1d7ed54..f37392e47 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -477,7 +477,7 @@ class FactEditor(object):
 
     def onFocusLost(self, widget):
         from ankiqt import mw
-        if self.fact is None:
+        if not self.fact:
             # editor or deck closed
             return
         if mw.inDbHandler: