diff --git a/pref.h b/pref.h
index 28e795cd0..37beb8faa 100644
--- a/pref.h
+++ b/pref.h
@@ -18,6 +18,7 @@ typedef struct {
 struct preferences {
 	const char *divelist_font;
 	const char *default_filename;
+	const char *default_cylinder;
 	double font_size;
 	partial_pressure_graphs_t pp_graphs;
 	short mod;
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 1b18b00db..68d23dffe 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -652,6 +652,7 @@ void MainWindow::readSettings()
 
 	s.beginGroup("GeneralSettings");
 	GET_TXT("default_filename", default_filename);
+	GET_TXT("default_cylinder", default_cylinder);
 	s.endGroup();
 
 	s.beginGroup("Display");
diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index 0249c894f..0740d3f51 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -78,6 +78,7 @@ void PreferencesDialog::setUiFromPrefs()
 	ui.font->setFont(QString(prefs.divelist_font));
 	ui.fontsize->setValue(prefs.font_size);
 	ui.defaultfilename->setText(prefs.default_filename);
+	ui.defaultcylinder->setText(prefs.default_cylinder);
 	ui.displayinvalid->setChecked(prefs.display_invalid_dives);
 	ui.show_sac->setChecked(prefs.show_sac);
 	ui.vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES);
@@ -139,6 +140,7 @@ void PreferencesDialog::syncSettings()
 	// Defaults
 	s.beginGroup("GeneralSettings");
 	s.value("default_filename", ui.defaultfilename->text());
+	s.value("default_cylinder", ui.defaultcylinder->text());
 	s.endGroup();
 
 	s.beginGroup("Display");
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 581670c91..d30752829 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -163,7 +163,7 @@
              </widget>
             </item>
             <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <layout class="QHBoxLayout" name="horizontalLayout_3b">
               <item>
                <widget class="QLineEdit" name="defaultfilename"/>
               </item>
@@ -193,6 +193,29 @@
            </layout>
           </widget>
          </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_6">
+           <property name="title">
+            <string>Default Cylinder</string>
+           </property>
+           <layout class="QFormLayout" name="formLayout_6">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>Use Default Cylinder</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <widget class="QLineEdit" name="defaultcylinder"/>
+             </item>
+            </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
          <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
@@ -252,7 +275,7 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="groupBox">
+          <widget class="QGroupBox" name="groupBox11">
            <property name="title">
             <string/>
            </property>
@@ -404,13 +427,13 @@
          <item>
           <layout class="QHBoxLayout">
            <item>
-            <widget class="QGroupBox">
+            <widget class="QGroupBox" name="groupBox">
              <property name="title">
               <string>Time units</string>
              </property>
              <layout class="QGridLayout">
               <item row="0" column="0">
-               <widget class="QLabel">
+               <widget class="QLabel" name="label13">
                 <property name="text">
                  <string>Ascent/Descent speed denominator</string>
                 </property>
@@ -717,7 +740,7 @@
                  <bool>false</bool>
                 </property>
                 <property name="text">
-				<string>Calculate NDL/TTS</string>
+                 <string>Calculate NDL/TTS</string>
                 </property>
                </widget>
               </item>