diff --git a/aqt/main.py b/aqt/main.py
index f8ed99cc1..e02076d40 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -586,6 +586,8 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
         toggle.setText(_("Toggle Toolbar"))
         self.connect(toggle, SIGNAL("triggered()"),
                      self.onToolbarToggle)
+        if not self.config['showToolbar']:
+            tb.hide()
 
     def onToolbarToggle(self):
         tb = self.form.toolBar
@@ -1155,7 +1157,7 @@ It can take a long time. Proceed?""")):
         addHook("macLoadEvent", self.onMacLoad)
         if isMac:
             qt_mac_set_menubar_icons(False)
-            self.setUnifiedTitleAndToolBarOnMac(True)
+            self.setUnifiedTitleAndToolBarOnMac(self.config['showToolbar'])
             # mac users expect a minimize option
             self.minimizeShortcut = QShortcut("Ctrl+m", self)
             self.connect(self.minimizeShortcut, SIGNAL("activated()"),
diff --git a/aqt/preferences.py b/aqt/preferences.py
index 186141395..aff651be6 100644
--- a/aqt/preferences.py
+++ b/aqt/preferences.py
@@ -147,6 +147,7 @@ class Preferences(QDialog):
         self.form.deleteMedia.setChecked(self.config['deleteMedia'])
         self.form.stripHTML.setChecked(self.config['stripHTML'])
         self.form.autoplaySounds.setChecked(self.config['autoplaySounds'])
+        self.form.showToolbar.setChecked(self.config['showToolbar'])
         self.connect(self.form.documentFolder,
                      SIGNAL("clicked()"),
                      self.onChangeFolder)
@@ -159,6 +160,7 @@ class Preferences(QDialog):
         self.config['autoplaySounds'] = self.form.autoplaySounds.isChecked()
         self.config['loadLastDeck'] = self.form.openLastDeck.isChecked()
         self.config['deleteMedia'] = self.form.deleteMedia.isChecked()
+        self.config['showToolbar'] = self.form.showToolbar.isChecked()
 
     def codeToIndex(self, code):
         n = 0
diff --git a/designer/preferences.ui b/designer/preferences.ui
index 4a3172261..53d6166b4 100644
--- a/designer/preferences.ui
+++ b/designer/preferences.ui
@@ -451,6 +451,13 @@
            </property>
           </widget>
          </item>
+         <item row="3" column="0">
+          <widget class="QCheckBox" name="showToolbar">
+           <property name="text">
+            <string>Show toolbar</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>
@@ -523,6 +530,7 @@
   <tabstop>stripHTML</tabstop>
   <tabstop>openLastDeck</tabstop>
   <tabstop>deleteMedia</tabstop>
+  <tabstop>showToolbar</tabstop>
   <tabstop>documentFolder</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>