diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org
index 866fd0395..c18f5d4f5 100644
--- a/doc/DOCUMENTATION.org
+++ b/doc/DOCUMENTATION.org
@@ -1512,6 +1512,7 @@ Windows manipulation commands (start with ~w~):
 | ~SPC w c~              | close a window                                                              |
 | ~SPC w C~              | delete another window using [[https://github.com/abo-abo/ace-window][ace-delete-window]]                               |
 | ~SPC w d~              | toggle window dedication (dedicated window cannot be reused by a mode)      |
+| ~SPC w f~              | toggle follow mode                                                          |
 | ~SPC w h~              | move to window on the left                                                  |
 | ~SPC w H~              | move window to the left                                                     |
 | ~SPC w j~              | move to window below                                                        |
diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el
index 3db427cbc..9373df4eb 100644
--- a/layers/+distribution/spacemacs-base/keybindings.el
+++ b/layers/+distribution/spacemacs-base/keybindings.el
@@ -295,6 +295,7 @@
   "wb"  'spacemacs/switch-to-minibuffer-window
   "wc"  'delete-window
   "wd"  'spacemacs/toggle-current-window-dedication
+  "wf"  'follow-mode
   "wH"  'evil-window-move-far-left
   "w <S-left>"  'evil-window-move-far-left
   "wh"  'evil-window-left