diff --git a/.config/kak/autoload/filetype/latex.kak b/.config/kak/autoload/filetype/latex.kak
index 93d76fbe..05dcbb5d 100644
--- a/.config/kak/autoload/filetype/latex.kak
+++ b/.config/kak/autoload/filetype/latex.kak
@@ -8,9 +8,8 @@ define-command -override -params 1 latex-surround-add %~
 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'
+        execute-keys -save-regs '"' -draft '<a-/>\\<c-r>a<ret>d<a-a>{<a-S>d'
     ^
-    
 ~
 
 hook global WinSetOption filetype=latex %{
@@ -24,7 +23,10 @@ hook global WinSetOption filetype=latex %{
 		unset-option window formatcmd
 		remove-hooks window latex-auto-format
 	}
-	# declare-filetype-mode latex
-	# map window latex i
+	declare-filetype-mode latex
+	map window latex i ': latex-surround-add emph<ret>'
+	map window latex <a-i> ': latex-surround-remove emph<ret>'
+	map window latex b ': latex-surround-add textbf<ret>'
+	map window latex <a-b> ': latex-surround-remove textbf<ret>'
 }