diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp
index 1f37423e2..bb5db33b7 100644
--- a/qt-models/divepicturemodel.cpp
+++ b/qt-models/divepicturemodel.cpp
@@ -111,12 +111,14 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const
 	return ret;
 }
 
-void DivePictureModel::removePicture(const QString &fileUrl)
+void DivePictureModel::removePicture(const QString &fileUrl, bool last)
 {
 	dive_remove_picture(fileUrl.toUtf8().data());
-	copy_dive(current_dive, &displayed_dive);
-	updateDivePictures();
-	mark_divelist_changed(true);
+	if (last) {
+		copy_dive(current_dive, &displayed_dive);
+		updateDivePictures();
+		mark_divelist_changed(true);
+	}
 }
 
 int DivePictureModel::rowCount(const QModelIndex &parent) const
diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h
index d6393e45f..7390fc5eb 100644
--- a/qt-models/divepicturemodel.h
+++ b/qt-models/divepicturemodel.h
@@ -33,7 +33,7 @@ public:
 	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
 	virtual void updateDivePictures();
 	void updateDivePicturesWhenDone(QList<QFuture<void> >);
-	void removePicture(const QString& fileUrl);
+	void removePicture(const QString& fileUrl, bool last);
 
 protected:
 	DivePictureModel();