diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 4ec90060b..0fd399148 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -236,7 +236,8 @@ class EditDeck(QMainWindow):
         restoreSplitter(self.dialog.splitter, "editor")
         self.show()
         self.updateSearch()
-        self.currentCard = self.parent.currentCard
+        if self.parent.currentCard:
+            self.currentCard = self.parent.currentCard
         self.focusCurrentCard()
 
     def findCardInDeckModel(self, model, card):