diff --git a/.config/kak/autoload/picker.kak b/.config/kak/autoload/picker.kak
index cd438c51..abf9a6fd 100644
--- a/.config/kak/autoload/picker.kak
+++ b/.config/kak/autoload/picker.kak
@@ -5,3 +5,11 @@ define-command file-picker %{
 }
 
 map -docstring 'file picker with .kakignore' global user F ':file-picker<ret>'
+
+define-command buffer-picker %{
+    prompt -buffer-completion 'open buffer:' %{
+        buffer %val{text}
+    }
+}
+
+map -docstring 'buffer picker' global user b ': buffer-picker<ret>'
diff --git a/.config/kak/autoload/plugins.kak b/.config/kak/autoload/plugins.kak
index 99ba56fd..7b7c3620 100644
--- a/.config/kak/autoload/plugins.kak
+++ b/.config/kak/autoload/plugins.kak
@@ -77,7 +77,7 @@ bundle-noload kakoune-hump https://github.com/delapouite/kakoune-hump %{
 	map global normal <c-W> ': extend-next-hump<ret>'     -docstring 'extend next hump'
 }
 
-bundle kakoune-buffers https://github.com/Delapouite/kakoune-buffers %{
+bundle-noload kakoune-buffers https://github.com/Delapouite/kakoune-buffers %{
 	map global user b ': enter-buffers-mode<ret>' -docstring 'buffers'
 }