diff --git a/aqt/dyndeckconf.py b/aqt/dyndeckconf.py
index 8db021016..022d04b90 100644
--- a/aqt/dyndeckconf.py
+++ b/aqt/dyndeckconf.py
@@ -9,10 +9,10 @@ from aqt.utils import showInfo, showWarning, openHelp, getOnlyText, askUser
 from operator import itemgetter
 
 class DeckConf(QDialog):
-    def __init__(self, mw, first=False, search=""):
+    def __init__(self, mw, first=False, search="", deck=None):
         QDialog.__init__(self, mw)
         self.mw = mw
-        self.deck = self.mw.col.decks.current()
+        self.deck = deck or self.mw.col.decks.current()
         # context-sensitive extras like deck:foo
         self.search = search
         self.form = aqt.forms.dyndconf.Ui_Dialog()
diff --git a/aqt/main.py b/aqt/main.py
index fe9cb967e..acfc35a3a 100644
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -649,7 +649,7 @@ upload, overwriting any changes either here or on AnkiWeb. Proceed?""")):
             deck = self.col.decks.current()
         if deck['dyn']:
             import aqt.dyndeckconf
-            aqt.dyndeckconf.DeckConf(self)
+            aqt.dyndeckconf.DeckConf(self, deck=deck)
         else:
             import aqt.deckconf
             aqt.deckconf.DeckConf(self, deck)