diff --git a/which-key.el b/which-key.el
index a996d28..f293503 100644
--- a/which-key.el
+++ b/which-key.el
@@ -776,6 +776,7 @@ problems at github.")
   (message "DEBUG: Advice called")
   (if (not (which-key--popup-showing-p))
       (apply orig-fn args)
+    (which-key--stop-timer)
     (which-key-C-h-dispatch)
     ;; Discard last prefix input. `discard-input' cannot be used
     ;; here as it ends any macro being defined.