diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
index d93cdb38..96116d71 100644
--- a/app/gui/SettingsView.qml
+++ b/app/gui/SettingsView.qml
@@ -41,6 +41,12 @@ Flickable {
         StreamingPreferences.save()
     }
 
+    Component.onDestruction: {
+        // Also save preferences on destruction, since we won't get a
+        // deactivating callback if the user just closes Moonlight
+        StreamingPreferences.save()
+    }
+
     Column {
         padding: 10
         id: settingsColumn1