diff --git a/core/core-spacemacs-buffer.el b/core/core-spacemacs-buffer.el
index ef86f2690..983927e11 100644
--- a/core/core-spacemacs-buffer.el
+++ b/core/core-spacemacs-buffer.el
@@ -53,15 +53,18 @@ version the release note it displayed")
 
 (defvar spacemacs-buffer-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map [tab] 'widget-forward)
-    (define-key map (kbd "j") 'widget-forward)
-    (define-key map (kbd "C-i") 'widget-forward)
-    (define-key map [backtab] 'widget-backward)
-    (define-key map (kbd "k") 'widget-backward)
-    (define-key map (kbd "RET") 'widget-button-press)
     (define-key map [down-mouse-1] 'widget-button-click)
-    (define-key map "q" 'quit-window)
+    (define-key map (kbd "RET") 'widget-button-press)
+
+    (define-key map [tab] 'widget-forward)
+    (define-key map (kbd "J") 'widget-forward)
+    (define-key map (kbd "C-i") 'widget-forward)
+
+    (define-key map [backtab] 'widget-backward)
+    (define-key map (kbd "K") 'widget-backward)
+
     (define-key map (kbd "C-r") 'spacemacs-buffer/refresh)
+    (define-key map "q" 'quit-window)
     map)
   "Keymap for spacemacs buffer mode.")
 
diff --git a/core/info/quickhelp.txt b/core/info/quickhelp.txt
index 3d6ff5216..059172275 100644
--- a/core/info/quickhelp.txt
+++ b/core/info/quickhelp.txt
@@ -1,6 +1,6 @@
-Press [TAB] to move to next button.
+Press [TAB] or [J] to move to next button.
 
-Press [Shift-TAB] to move to previous button.
+Press [Shift-TAB] or [K] to move to previous button.
 
 Press [r] to jump to recent file list if it is enabled.