diff --git a/aqt/editor.py b/aqt/editor.py
index 554628326..37792c051 100644
--- a/aqt/editor.py
+++ b/aqt/editor.py
@@ -627,8 +627,15 @@ class Editor(object):
                 self.deck.setCol(self.mw.col)
             self.tags.setCol(self.mw.col)
         if self.addMode:
-            self.deck.setText(self.mw.col.decks.nameOrNone(
-                self.note.model()['did']) or _("Default"))
+            if self.mw.col.conf.get("addToCur", True):
+                col = self.mw.col
+                did = col.conf['curDeck']
+                if col.decks.isDyn(did):
+                    did = 1
+                self.deck.setText(self.mw.col.decks.name(did))
+            else:
+                self.deck.setText(self.mw.col.decks.nameOrNone(
+                    self.note.model()['did']) or _("Default"))
         self.tags.setText(self.note.stringTags().strip())
 
     def saveTags(self):
diff --git a/aqt/preferences.py b/aqt/preferences.py
index 883c371a6..76a871c94 100644
--- a/aqt/preferences.py
+++ b/aqt/preferences.py
@@ -53,6 +53,7 @@ class Preferences(QDialog):
         f.showProgress.setChecked(qc['dueCounts'])
         f.newSpread.addItems(c.newCardSchedulingLabels().values())
         f.newSpread.setCurrentIndex(qc['newSpread'])
+        f.useCurrent.setChecked(qc.get("addToCur", True))
 
     def updateCollection(self):
         f = self.form
@@ -63,6 +64,7 @@ class Preferences(QDialog):
         qc['newSpread'] = f.newSpread.currentIndex()
         qc['timeLim'] = f.timeLimit.value()*60
         qc['collapseTime'] = f.lrnCutoff.value()*60
+        qc['addToCur'] = f.useCurrent.isChecked()
         hrs = f.dayOffset.value()
         old = self.startDate
         date = datetime.datetime(
diff --git a/designer/preferences.ui b/designer/preferences.ui
index 0bd11be8e..753bb25b9 100644
--- a/designer/preferences.ui
+++ b/designer/preferences.ui
@@ -51,6 +51,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="useCurrent">
+         <property name="text">
+          <string>Use the current deck as the default when adding notes</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QComboBox" name="newSpread"/>
        </item>
@@ -458,6 +465,7 @@
   <tabstop>showEstimates</tabstop>
   <tabstop>showProgress</tabstop>
   <tabstop>stripHTML</tabstop>
+  <tabstop>useCurrent</tabstop>
   <tabstop>newSpread</tabstop>
   <tabstop>dayOffset</tabstop>
   <tabstop>lrnCutoff</tabstop>