diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c40d8f633..c683cc2ba 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1355,7 +1355,9 @@ const AppIcon = new Lang.Class({
             this._removeMenuTimeout();
             this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
                 Lang.bind(this, function() {
+                    this._menuTimeoutId = 0;
                     this.popupMenu();
+                    return false;
                 }));
         } else if (button == 3) {
             this.popupMenu();
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index d452f9cc7..57e7628d3 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -434,6 +434,7 @@ const VPNRequestHandler = new Lang.Class({
     },
 
     _vpnChildFinished: function(pid, status, requestObj) {
+        this._childWatch = 0;
         if (this._newStylePlugin) {
             // For new style plugin, all work is done in the async reading functions
             // Just reap the process here
diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index c4565ecff..b24791df8 100644
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -960,6 +960,8 @@ const ChatNotification = new Lang.Class({
     },
 
     appendTimestamp: function() {
+        this._timestampTimeoutId = 0;
+
         let lastMessageTime = this._history[0].time;
         let lastMessageDate = new Date(lastMessageTime * 1000);
 
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 11f619ae1..60ca3f7c0 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -415,6 +415,7 @@ const EndSessionDialog = new Lang.Class({
                 let dialogContent = DialogContent[this._type];
                 let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
                 this._confirm(button.signal);
+                this._timerId = 0;
 
                 return false;
             }));
diff --git a/js/ui/overview.js b/js/ui/overview.js
index fedfea0b9..867f7ef92 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -363,11 +363,13 @@ const Overview = new Lang.Class({
             this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
             this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
                                             Lang.bind(this, function() {
+                                                this._windowSwitchTimeoutId = 0;
                                                 this._needsFakePointerEvent = true;
                                                 Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                     this._windowSwitchTimestamp);
                                                 this.hide();
                                                 this._lastHoveredWindow = null;
+                                                return false;
                                             }));
         }
 
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index be1407d90..4f3958d5c 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1208,6 +1208,7 @@ const Workspace = new Lang.Class({
         }
 
         this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this._repositionWindowsId = 0;
         return false;
     },