diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 2a6bef675..a0db67908 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -917,6 +917,7 @@ Other:
   - Added ranger-mode to golden-ratio-exclude-modes (thanks to Langston Barrett)
   - Fixed evil surround bindings (thanks to Hoyon Mak)
   - Improved Window Manipulation Transient state (thanks to yuhan0)
+  - Exclude which-key from layer sync powerline restore (thanks to Doug Wilson)
 *** Layer changes and fixes
 **** Ansible
 - Improvements:
diff --git a/layers/+spacemacs/spacemacs-modeline/funcs.el b/layers/+spacemacs/spacemacs-modeline/funcs.el
index 11c1aea30..ca755dfcc 100644
--- a/layers/+spacemacs/spacemacs-modeline/funcs.el
+++ b/layers/+spacemacs/spacemacs-modeline/funcs.el
@@ -50,9 +50,11 @@ Return nil if no scale is defined."
     (powerline-reset)))
 
 (defun spacemacs//restore-buffers-powerline ()
-  "Restore the powerline in all buffers."
+  "Restore the powerline in the buffers.
+Excluding which-key."
   (dolist (buffer (buffer-list))
-    (spacemacs//restore-powerline buffer)))
+    (unless (string-match-p "\\*which-key\\*" (buffer-name buffer))
+      (spacemacs//restore-powerline buffer))))
 
 (defun spacemacs//prepare-diminish ()
   (when spaceline-minor-modes-p