diff --git a/which-key.el b/which-key.el
index 738275dc421..ab564626140 100644
--- a/which-key.el
+++ b/which-key.el
@@ -422,8 +422,8 @@ to a non-nil value for the execution of a command. Like this
 ;; Internal Vars
 (defvar which-key--buffer nil
   "Internal: Holds reference to which-key buffer.")
-(defvar which-key--window nil
-  "Internal: Holds reference to which-key window.")
+;; (defvar which-key--window nil
+;;   "Internal: Holds reference to which-key window.")
 (defvar which-key--timer nil
   "Internal: Holds reference to open window timer.")
 (defvar which-key--paging-timer nil
@@ -875,6 +875,9 @@ total height."
   (when (frame-live-p which-key--frame)
     (delete-frame which-key--frame)))
 
+(defun which-key--popup-showing-p ()
+  (window-live-p (get-buffer-window which-key--buffer)))
+
 (defun which-key--show-popup (act-popup-dim)
   "Show the which-key buffer.
 ACT-POPUP-DIM includes the dimensions, (height . width) of the