diff --git a/lib/extension/window.js b/lib/extension/window.js
index 61820e1..559b69e 100644
--- a/lib/extension/window.js
+++ b/lib/extension/window.js
@@ -289,7 +289,7 @@ export class WindowManager extends GObject.Object {
 
     let settings = this.ext.settings;
 
-    settings.connect("changed", (_, settingName) => {
+    this._settingsChangedId = settings.connect("changed", (_, settingName) => {
       switch (settingName) {
         case "window-overrides-reload-trigger":
           // Reload window overrides when triggered by preferences
@@ -1158,6 +1158,11 @@ export class WindowManager extends GObject.Object {
       this._overviewSignals = null;
     }
 
+    if (this._settingsChangedId) {
+      this.ext.settings.disconnect(this._settingsChangedId);
+      this._settingsChangedId = 0;
+    }
+
     this._signalsBound = false;
   }