diff --git a/js/ui/dash.js b/js/ui/dash.js
index 13651fa4c..3c5e89d81 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -576,6 +576,7 @@ const Dash = new Lang.Class({
                     Lang.bind(this, function() {
                         this._labelShowing = true;
                         item.showLabel();
+                        this._showLabelTimeoutId = 0;
                         return false;
                     }));
                 if (this._resetHoverTimeoutId > 0) {
@@ -592,6 +593,7 @@ const Dash = new Lang.Class({
                 this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
                     Lang.bind(this, function() {
                         this._labelShowing = false;
+                        this._resetHoverTimeoutId = 0;
                         return false;
                     }));
             }