diff --git a/src/lib/app/autosaver.cpp b/src/lib/app/autosaver.cpp
index 894d27990..4f81eff20 100644
--- a/src/lib/app/autosaver.cpp
+++ b/src/lib/app/autosaver.cpp
@@ -18,12 +18,14 @@
 #include "autosaver.h"
 
 #include <QTimerEvent>
+#include <QCoreApplication>
 
 #define SAVE_DELAY 1000 * 10 // 10 seconds
 
 AutoSaver::AutoSaver(QObject* parent)
     : QObject(parent)
 {
+    connect(qApp, &QCoreApplication::aboutToQuit, this, &AutoSaver::saveIfNecessary);
 }
 
 void AutoSaver::saveIfNecessary()
diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp
index 3c5a5e7bf..c0bbdc161 100644
--- a/src/lib/plugins/speeddial.cpp
+++ b/src/lib/plugins/speeddial.cpp
@@ -76,10 +76,6 @@ void SpeedDial::saveSettings()
 {
     ENSURE_LOADED;
 
-    if (m_pages.isEmpty()) {
-        return;
-    }
-
     Settings settings;
     settings.beginGroup("SpeedDial");
     settings.setValue("pages", generateAllPages());