diff --git a/.config/kak/autoload/filetype/latex.kak b/.config/kak/autoload/filetype/latex.kak
index 90cd44f2..93d76fbe 100644
--- a/.config/kak/autoload/filetype/latex.kak
+++ b/.config/kak/autoload/filetype/latex.kak
@@ -1,9 +1,16 @@
 # wrap selection in \emph{...}
-define-command -params 1 latex-surround-add %~
-    execute-keys -draft 'i\emph{<esc>a}'
+define-command -override -params 1 latex-surround-add %~
+    evaluate-commands -save-regs 'a' -no-hooks %^
+        set-register a %arg{1}
+        execute-keys -draft 'i\<c-r>a{<esc>a}'
+    ^
 ~
-define-command -params 1 latex-surround-remove %~
-    execute-keys -save-regs '"' -draft '<a-a>{<a-S>d<a-/>\\emph<ret>d'
+define-command -override -params 1 latex-surround-remove %~
+    evaluate-commands -save-regs 'a"' -no-hooks %^
+        set-register a %arg{1}
+        execute-keys -save-regs '"' -draft '<a-a>{<a-S>d<a-/>\\<c-r>a<ret>d'
+    ^
+    
 ~
 
 hook global WinSetOption filetype=latex %{