diff --git a/src/app/window.js b/src/app/window.js
index 2506d60240ba8f335d3da0d582b8ff381dcf30b7..0c88fb369617ce5c483a4504c34a82d5bdf3dd02 100644
--- a/src/app/window.js
+++ b/src/app/window.js
@@ -90,7 +90,10 @@ export const MainWindow = GObject.registerClass({
 
         this._settings = Util.getSettings('org.gnome.Weather');
         this._restoreWindowGeometry();
-        this.connect('close-request', () => this._saveWindowGeometry());
+
+        this._settings.bind("window-width", this, "default-width", Gio.SettingsBindFlags.DEFAULT)
+        this._settings.bind("window-height", this, "default-height", Gio.SettingsBindFlags.DEFAULT)
+        this._settings.bind("window-maximized", this, "maximized", Gio.SettingsBindFlags.DEFAULT)
     }
 
     vfunc_unroot() {
@@ -117,20 +120,6 @@ export const MainWindow = GObject.registerClass({
 
         this._currentPage = page;
     }
-    _saveWindowGeometry() {
-        this._settings.set_boolean(
-            'window-maximized',
-            this.maximized
-        );
-
-        let defaultWindowSize = this.get_default_size()
-        this._settings.set_int(
-            'window-width', defaultWindowSize[0]
-        );
-        this._settings.set_int(
-            'window-height', defaultWindowSize[1]
-        );
-    }
 
     _restoreWindowGeometry() {
         if (this._settings.get_boolean('window-maximized')) {