diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el
index 6c0e92095..b77abbd19 100644
--- a/modules/feature/popup/+hacks.el
+++ b/modules/feature/popup/+hacks.el
@@ -231,6 +231,19 @@ instead of switch-to-buffer-*."
   (advice-add #'wgrep-finish-edit :after #'+popup*close))
 
 
+;; `which-key'
+(setq which-key-popup-type 'custom
+      which-key-custom-popup-max-dimensions-function (lambda (_) (which-key--side-window-max-dimensions))
+      which-key-custom-hide-popup-function #'which-key--hide-buffer-side-window
+      which-key-custom-show-popup-function
+      (lambda (act-popup-dim)
+        (cl-letf (((symbol-function 'display-buffer-in-side-window)
+                   (lambda (buffer alist)
+                     (+popup-display-buffer
+                      buffer (append '((vslot . -9999)) alist)))))
+          (which-key--show-buffer-side-window act-popup-dim))))
+
+
 ;; `windmove'
 (progn
   ;; Users should be about to hop into popups easily, but Elisp shouldn't.