diff --git a/.config/kak/autoload/surround.kak b/.config/kak/autoload/surround.kak
index 9ea57a24..2da58356 100644
--- a/.config/kak/autoload/surround.kak
+++ b/.config/kak/autoload/surround.kak
@@ -82,19 +82,24 @@ define-command surround-replace %{
     }
 }
 
-map global surround-add ( ':surround-add-pair ( )<ret>'                  -docstring 'surround with parenthesis'
-map global surround-add ) ':surround-add-pair ( )<ret>'                  -docstring 'surround with parenthesis'
-map global surround-add [ ':surround-add-pair [ ]<ret>'                  -docstring 'surround with brackets'
-map global surround-add ] ':surround-add-pair [ ]<ret>'                  -docstring 'surround with brackets'
-map global surround-add { ':surround-add-pair { }<ret>'                  -docstring 'surround with braces'
-map global surround-add } ':surround-add-pair { }<ret>'                  -docstring 'surround with braces'
-map global surround-add < ':surround-add-pair <lt> <gt><ret>'            -docstring 'surround with angles'
-map global surround-add > ':surround-add-pair <lt> <gt><ret>'            -docstring 'surround with angles'
-map global surround-add "'" ":surround-add-pair ""'"" ""'""<ret>"        -docstring 'surround with quotes'
-map global surround-add '"' ":surround-add-pair '""' '""'<ret>"          -docstring 'surround with double quotes'
-map global surround-add *   ':surround-add-pair * *<ret>'                -docstring 'surround with asteriks'
-map global surround-add _   ':surround-add-pair _ _<ret>'                -docstring 'surround with undescores'
-map global surround-add s ':surround-add<ret>'                           -docstring 'surround custom character'
+map global surround-add (   ':surround-add-pair ( )<ret>'                  -docstring 'surround with parenthesis'
+map global surround-add )   ':surround-add-pair ( )<ret>'                  -docstring 'surround with parenthesis'
+map global surround-add [   ':surround-add-pair [ ]<ret>'                  -docstring 'surround with brackets'
+map global surround-add ]   ':surround-add-pair [ ]<ret>'                  -docstring 'surround with brackets'
+map global surround-add {   ':surround-add-pair { }<ret>'                  -docstring 'surround with braces'
+map global surround-add }   ':surround-add-pair { }<ret>'                  -docstring 'surround with braces'
+map global surround-add <   ':surround-add-pair <lt> <gt><ret>'            -docstring 'surround with angles'
+map global surround-add >   ':surround-add-pair <lt> <gt><ret>'            -docstring 'surround with angles'
+map global surround-add "'" ":surround-add-pair ""'"" ""'""<ret>"          -docstring 'surround with single quotes'
+map global surround-add q   ":surround-add-pair ""'"" ""'""<ret>"          -docstring 'surround with single quotes'
+map global surround-add '"' ":surround-add-pair '""' '""'<ret>"            -docstring 'surround with double quotes'
+map global surround-add Q   ":surround-add-pair '""' '""'<ret>"            -docstring 'surround with double quotes'
+map global surround-add *   ':surround-add-pair * *<ret>'                  -docstring 'surround with asteriks'
+map global surround-add _   ':surround-add-pair _ _<ret>'                  -docstring 'surround with undescores'
+map global surround-add `   ':surround-add-pair ` `<ret>'                  -docstring 'surround with backticks'
+map global surround-add |   ':surround-add-pair | |<ret>'                  -docstring 'surround with pipes'
+map global surround-add $   ':surround-add-pair $ $<ret>'                  -docstring 'surround with dollars'
+map global surround-add s   ':surround-add<ret>'                           -docstring 'surround custom character'
 
 map -docstring 'surround' global normal k ': enter-user-mode surround<ret>'
 map -docstring 'add surrounding' global surround s ': enter-user-mode surround-add<ret>'