diff --git a/src/revealers.js b/src/revealers.js
index 458219ba..d58c7641 100644
--- a/src/revealers.js
+++ b/src/revealers.js
@@ -31,6 +31,9 @@ class ClapperCustomRevealer extends Gtk.Revealer
 
     revealChild(isReveal)
     {
+        if(this.reveal_child === isReveal)
+            return;
+
         if(isReveal)
             this.visible = true;
 
@@ -188,6 +191,12 @@ class ClapperRevealerTop extends CustomRevealer
     {
         if(this.transition_type !== this._requestedTransition)
             this.transition_type = this._requestedTransition;
+
+        if(this.child_revealed) {
+            const clapperWidget = this.root.child;
+
+            clapperWidget._setHideControlsTimeout();
+        }
     }
 });
 
diff --git a/src/widget.js b/src/widget.js
index ee5d6fb9..c7223189 100644
--- a/src/widget.js
+++ b/src/widget.js
@@ -120,7 +120,10 @@ class ClapperWidget extends Gtk.Grid
         if(isAllowInput)
             this.setControlsCanFocus(true);
 
-        this._setHideControlsTimeout();
+        /* Reset timeout if already revealed, otherwise
+         * timeout will be set after reveal finishes */
+        if(this.revealerTop.child_revealed)
+            this._setHideControlsTimeout();
     }
 
     toggleFullscreen()