diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 58fee4a7..5115a682 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -782,8 +782,8 @@ const WindowList = new Lang.Class({
             }));
         this._windowList.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
 
-	let indicatorsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.END });
-	box.add(indicatorsBox);
+        let indicatorsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.END });
+        box.add(indicatorsBox);
 
         this._workspaceIndicator = new WorkspaceIndicator();
         indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });
@@ -1165,6 +1165,9 @@ const WindowList = new Lang.Class({
 
         global.screen.disconnect(this._fullscreenChangedId);
 
+        Main.xdndHandler.disconnect(this._dragBeginId);
+        Main.xdndHandler.disconnect(this._dragEndId);
+
         this._settings.disconnect(this._groupingModeChangedId);
 
         let windows = global.get_window_actors();