diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
index 2237fb908..12a8c320f 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/qt-ui/divelogexportdialog.cpp
@@ -56,6 +56,9 @@ DiveLogExportDialog::DiveLogExportDialog(QWidget *parent) : QDialog(parent),
 	if (settings.contains("listOnly")) {
 		ui->exportListOnly->setChecked(settings.value("listOnly").toBool());
 	}
+	if (settings.contains("exportPhotos")) {
+		ui->exportPhotos->setChecked(settings.value("exportPhotos").toBool());
+	}
 	settings.endGroup();
 }
 
@@ -105,8 +108,12 @@ void DiveLogExportDialog::exportHtmlInit(const QString &filename)
 	QString json_settings = exportFiles + QDir::separator() + "settings.js";
 	QString translation = exportFiles + QDir::separator() + "translation.js";
 	QString stat_file = exportFiles + QDir::separator() + "stat.js";
-	QString photos_directory = exportFiles + QDir::separator() + "photos" + QDir::separator();
-	mainDir.mkdir(photos_directory);
+
+	QString photos_directory;
+	if (ui->exportPhotos->isChecked()) {
+		photos_directory = exportFiles + QDir::separator() + "photos" + QDir::separator();
+		mainDir.mkdir(photos_directory);
+	}
 	exportFiles += "/";
 
 	exportHTMLsettings(json_settings);
@@ -143,6 +150,7 @@ void DiveLogExportDialog::exportHTMLsettings(const QString &filename)
 	settings.setValue("subsurfaceNumbers", ui->exportSubsurfaceNumber->isChecked());
 	settings.setValue("yearlyStatistics", ui->exportStatistics->isChecked());
 	settings.setValue("listOnly", ui->exportListOnly->isChecked());
+	settings.setValue("exportPhotos", ui->exportPhotos->isChecked());
 	settings.endGroup();
 
 	QString fontSize = ui->fontSizeSelection->currentText();
diff --git a/qt-ui/divelogexportdialog.ui b/qt-ui/divelogexportdialog.ui
index 7514a6551..1f3675ef4 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/qt-ui/divelogexportdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>507</width>
-    <height>423</height>
+    <height>468</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -233,9 +233,9 @@
           </layout>
          </widget>
          <widget class="QGroupBox" name="groupBox">
-           <property name="enabled">
-             <bool>false</bool>
-           </property>
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="geometry">
            <rect>
             <x>0</x>
@@ -338,13 +338,23 @@
             </attribute>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="3" column="0">
            <widget class="QCheckBox" name="exportListOnly">
             <property name="text">
              <string>Export list only</string>
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="exportPhotos">
+            <property name="text">
+             <string>Export photos</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -363,6 +373,9 @@
           <bool>false</bool>
          </property>
          <layout class="QFormLayout" name="formLayout">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="fontLabel">
             <property name="text">
@@ -513,20 +526,40 @@
    </hints>
   </connection>
   <connection>
-    <sender>exportCSV</sender>
-    <signal>toggled(bool)</signal>
-    <receiver>groupBox</receiver>
-    <slot>setEnabled(bool)</slot>
+   <sender>exportCSV</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
   </connection>
   <connection>
-    <sender>exportCSVDetails</sender>
-    <signal>toggled(bool)</signal>
-    <receiver>groupBox</receiver>
-    <slot>setEnabled(bool)</slot>
+   <sender>exportCSVDetails</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="exportGroup"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="exportGroup"/>
  </buttongroups>
 </ui>
diff --git a/save-html.c b/save-html.c
index f9f1cf0d1..d15ac962f 100644
--- a/save-html.c
+++ b/save-html.c
@@ -329,7 +329,7 @@ void write_one_dive(struct membuffer *b, struct dive *dive, const char *photos_d
 		put_HTML_samples(b, dive);
 		put_HTML_bookmarks(b, dive);
 		write_dive_status(b, dive);
-		if (photos_dir)
+		if (photos_dir && strcmp(photos_dir, ""))
 			save_photos(b, photos_dir, dive);
 		write_divecomputers(b, dive);
 	}