diff --git a/.config/kak/autoload/xml.kak b/.config/kak/autoload/xml.kak
index 85e50726..2865779a 100644
--- a/.config/kak/autoload/xml.kak
+++ b/.config/kak/autoload/xml.kak
@@ -9,6 +9,23 @@ define-command -hidden -params 1 xml-surround-add-impl %~
 define-command -hidden -params 1 xml-surround-remove-impl %~
     evaluate-commands -save-regs 'a"' -no-hooks %^
         set-register a %arg{1}
-        execute-keys -save-regs '"' -draft '<a-/><lt><c-r>a<gt><ret>d/<lt>/<c-r>a<gt>d'
+        execute-keys -save-regs '"' -draft '<a-/><lt><c-r>a<gt><ret>d/<lt>/<c-r>a<gt><ret>d'
     ^
 ~
+
+define-command xml-surround-add %{
+    prompt add: %{
+        xml-surround-add-impl %val{text}
+    }
+}
+define-command xml-surround-remove %{
+    prompt remove: %{
+        xml-surround-remove-impl %val{text}
+    }
+}
+
+hook global WinSetOption filetype=(xml|html|markdown) %{
+    declare-filetype-mode %opt{filetype}
+    map window %opt{filetype} s ': xml-surround-add<ret>' -docstring 'tag surround add'
+    map window %opt{filetype} r ': xml-surround-remove<ret>' -docstring 'tag surround remove'
+}