diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index 09ffeb6e573b6b544a73d907c13e597e3711df05..001dd47ec260289a38f770037012f088d99a43f7 100644
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -95,6 +95,11 @@ class WindowAttentionSource extends MessageTray.Source {
     }
 
     open() {
+        // Make sure everything is settled before activating the window to
+        // avoid interference from the window object's signal handlers while
+        // the notification is still active.
+        this.destroy();
+
         Main.activateWindow(this._window);
     }
 });