diff --git a/aqt/deckchooser.py b/aqt/deckchooser.py
index 754a0e074..fca534691 100644
--- a/aqt/deckchooser.py
+++ b/aqt/deckchooser.py
@@ -75,7 +75,8 @@ class DeckChooser(QHBoxLayout):
             self.mw, current=current, accept=_("Choose"),
             title=_("Choose Deck"), help="addingnotes",
             cancel=False, parent=self.widget, geomKey="selectDeck")
-        self.setDeckName(ret.name)
+        if ret.name:
+            self.setDeckName(ret.name)
 
     def setDeckName(self, name):
         self.deck.setText(name.replace("&", "&&"))
diff --git a/aqt/studydeck.py b/aqt/studydeck.py
index d3cdf4c0a..7ac4315fe 100644
--- a/aqt/studydeck.py
+++ b/aqt/studydeck.py
@@ -114,8 +114,6 @@ class StudyDeck(QDialog):
     def reject(self):
         saveGeom(self, self.geomKey)
         remHook('reset', self.onReset)
-        if not self.cancel:
-            return self.accept()
         QDialog.reject(self)
 
     def onAddDeck(self):