diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 6ad91acec..1164c5de3 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -84,6 +84,7 @@ PreferencesDialog::PreferencesDialog()
 		pagesList->addItem(item);
 		pagesStack->addWidget(page);
 		page->refreshSettings();
+		connect(page, &AbstractPreferencesWidget::settingsChanged, &diveListNotifier, &DiveListNotifier::settingsChanged);
 	}
 
 	connect(pagesList, &QListWidget::currentRowChanged,
@@ -116,10 +117,8 @@ void PreferencesDialog::refreshPages()
 
 void PreferencesDialog::applyRequested(bool closeIt)
 {
-	Q_FOREACH(AbstractPreferencesWidget *page, pages) {
-		connect(page, &AbstractPreferencesWidget::settingsChanged, &diveListNotifier, &DiveListNotifier::settingsChanged, Qt::UniqueConnection);
+	for (AbstractPreferencesWidget *page: pages)
 		page->syncSettings();
-	}
 	emit diveListNotifier.settingsChanged();
 	if (closeIt)
 		accept();
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index d05487b98..4eb222006 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -3,7 +3,6 @@
 #define PREFERENCES_WIDGET_H
 
 #include <QDialog>
-#include "core/pref.h"
 
 class AbstractPreferencesWidget;
 class QListWidget;
@@ -14,7 +13,7 @@ class QAbstractButton;
 class PreferencesDialog : public QDialog {
 	Q_OBJECT
 public:
-	static PreferencesDialog* instance();
+	static PreferencesDialog *instance();
 	~PreferencesDialog();
 	void refreshPages();
 	void defaultsRequested();