diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 483b71dc4..31283e690 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1606,6 +1606,8 @@ const MessageTray = new Lang.Class({
     },
 
     _trayDwellTimeout: function() {
+        this._trayDwellTimeoutId = 0;
+
         if (Main.modalCount > 0)
             return false;
 
@@ -1616,8 +1618,6 @@ const MessageTray = new Lang.Class({
         if (currentUserTime != this._trayDwellUserTime)
             return false;
 
-        this._trayDwellTimeoutId = 0;
-
         this._traySummoned = true;
         this._updateState();