diff --git a/mise.usage.kdl b/mise.usage.kdl
index 4a26cc9124..f1688e4f0a 100644
--- a/mise.usage.kdl
+++ b/mise.usage.kdl
@@ -1199,9 +1199,9 @@ case $cur in
     done
     ;;
 esac
-"#
+"""#
 
-complete "installed_tool@version" run=r#"
+complete "installed_tool@version" run=#"""
 cur="{{words[CURRENT]}}"
 case $cur in
   *@*)
diff --git a/src/assets/mise-extra.usage.kdl b/src/assets/mise-extra.usage.kdl
index dc2823ae73..223b140ea0 100644
--- a/src/assets/mise-extra.usage.kdl
+++ b/src/assets/mise-extra.usage.kdl
@@ -42,9 +42,9 @@ case $cur in
     done
     ;;
 esac
-"#
+"""#
 
-complete "installed_tool@version" run=r#"
+complete "installed_tool@version" run=#"""
 cur="{{words[CURRENT]}}"
 case $cur in
   *@*)
diff --git a/xtasks/fig/src/mise.ts b/xtasks/fig/src/mise.ts
index b9b6831bca..0f3afc985f 100644
--- a/xtasks/fig/src/mise.ts
+++ b/xtasks/fig/src/mise.ts
@@ -2576,6 +2576,8 @@ const completionSpec: Fig.Spec = {
         description: "Tool(s) to remove",
         isOptional: true,
         isVariadic: true,
+        generators: installedToolVersionGenerator,
+        debounce: true,
       },
     },
     {
@@ -2625,6 +2627,8 @@ const completionSpec: Fig.Spec = {
         name: "installed_tool@version",
         description: "Tool(s) to remove",
         isVariadic: true,
+        generators: installedToolVersionGenerator,
+        debounce: true,
       },
     },
     {