diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index a6c5eff12..7ecde67d3 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -799,10 +799,10 @@ Other:
   - Added =link-hint-copy-link= to ~SPC x y~ (thanks to William Casarin)
   - Added =evil-unimpaired= navigation keys prefixed by ~[~ and ~]~ to the
     Spacemacs home buffer (thanks to Sorawee Porncharoenwase)
-  - Added key bindings for indirect buffer functions under ~SPC b c~:
-    - ~n~ calls =make-indirect-buffer=
-    - ~c~ calls =clone-indirect-buffer=
-    - ~w~ calls =clone-indirect-buffer-other-window=
+  - Added key bindings for indirect buffer functions under ~SPC b N~:
+    - ~C-i~ calls =make-indirect-buffer=
+    - ~i~ calls =clone-indirect-buffer=
+    - ~I~ calls =clone-indirect-buffer-other-window=
 - Improvements:
   - Rewrote window layout functions for ~SPC w 1~, ~SPC w 2~, ~SPC w 3~, and
     ~SPC w 4~ (thanks to Codruț Constantin Gușoi):
diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org
index 71d2c1d60..64b8bf585 100644
--- a/doc/DOCUMENTATION.org
+++ b/doc/DOCUMENTATION.org
@@ -2356,9 +2356,6 @@ Buffer manipulation commands (start with ~b~):
 |-----------------+----------------------------------------------------------------------------------------|
 | ~SPC TAB~       | switch to alternate buffer in the current window (switch back and forth)               |
 | ~SPC b b~       | switch to a buffer                                                                     |
-| ~SPC b c n~     | create an indirect buffer                                                              |
-| ~SPC b c c~     | create an indirect buffer that is clone of current buffer                              |
-| ~SPC b c w~     | create an indirect buffer that is clone of current buffer, and open it in other window |
 | ~SPC b d~       | kill the current buffer (does not delete the visited file)                             |
 | ~SPC u SPC b d~ | kill the current buffer and window (does not delete the visited file)                  |
 | ~SPC b D~       | kill a visible buffer using [[https://github.com/abo-abo/ace-window][ace-window]]                                                 |
@@ -2384,13 +2381,16 @@ Buffer manipulation commands (start with ~b~):
 
 **** Create a new empty buffer
 
-| Key binding | Description                                           |
-|-------------+-------------------------------------------------------|
-| ~SPC b N h~ | create new empty buffer in a new window on the left   |
-| ~SPC b N j~ | create new empty buffer in a new window at the bottom |
-| ~SPC b N k~ | create new empty buffer in a new window above         |
-| ~SPC b N l~ | create new empty buffer in a new window below         |
-| ~SPC b N n~ | create new empty buffer in current window             |
+| Key binding   | Description                                                                                     |
+|---------------+-------------------------------------------------------------------------------------------------|
+| ~SPC b N h~   | create new empty buffer in a new window on the left                                             |
+| ~SPC b N C-i~ | create an indirect buffer from an existing opened buffer                                        |
+| ~SPC b N i~   | create an indirect buffer that is clone of currently opened buffer                              |
+| ~SPC b N I~   | create an indirect buffer that is clone of currently opened buffer, and open it in other window |
+| ~SPC b N j~   | create new empty buffer in a new window at the bottom                                           |
+| ~SPC b N k~   | create new empty buffer in a new window above                                                   |
+| ~SPC b N l~   | create new empty buffer in a new window below                                                   |
+| ~SPC b N n~   | create new empty buffer in current window                                                       |
 
 **** Buffers manipulation transient state
 A convenient buffer manipulation transient state allows to quickly cycles through
diff --git a/layers/+spacemacs/spacemacs-defaults/keybindings.el b/layers/+spacemacs/spacemacs-defaults/keybindings.el
index 68bb41328..e821b3904 100644
--- a/layers/+spacemacs/spacemacs-defaults/keybindings.el
+++ b/layers/+spacemacs/spacemacs-defaults/keybindings.el
@@ -24,7 +24,7 @@
                                        ("A"   "other applications")
                                        ("b"   "buffers")
                                        ("bc"  "indirect buffers")
-                                       ("bN"  "new empty buffer")
+                                       ("bN"  "new buffer")
                                        ("c"   "compile/comments")
                                        ("C"   "capture/colors")
                                        ("d"   "documentation")
@@ -142,9 +142,6 @@
 ;; buffers --------------------------------------------------------------------
 (spacemacs/set-leader-keys
   "TAB"   'spacemacs/alternate-buffer
-  "b c n" 'make-indirect-buffer
-  "b c c" 'clone-indirect-buffer
-  "b c w" 'clone-indirect-buffer-other-window-without-purpose
   "bd"    'spacemacs/kill-this-buffer
   "be"    'spacemacs/safe-erase-buffer
   "bh"    'spacemacs/home
@@ -154,6 +151,9 @@
   "bn"    'next-buffer
   "bm"    'spacemacs/switch-to-messages-buffer
   "b N h" 'spacemacs/new-empty-buffer-left
+  "b N C-i" 'make-indirect-buffer
+  "b N i" 'clone-indirect-buffer
+  "b N I" 'clone-indirect-buffer-other-window-without-purpose
   "b N j" 'spacemacs/new-empty-buffer-below
   "b N k" 'spacemacs/new-empty-buffer-above
   "b N l" 'spacemacs/new-empty-buffer-right