diff --git a/src/components/widgets/macros/MacroBtn.vue b/src/components/widgets/macros/MacroBtn.vue
index a919d526d7..644c383adf 100644
--- a/src/components/widgets/macros/MacroBtn.vue
+++ b/src/components/widgets/macros/MacroBtn.vue
@@ -50,9 +50,11 @@
                 spellcheck="false"
                 class="console-command"
                 :class="{ 'mb-3': (i < paramList.length - 1) }"
+                @focus="$event.target.select()"
               >
                 <template #append>
                   <app-btn
+                    v-if="params[param].value !== params[param].reset"
                     style="margin-top: -4px; margin-right: -6px;"
                     color=""
                     icon
diff --git a/src/components/widgets/toolhead/ToolHeadIdexControl.vue b/src/components/widgets/toolhead/ToolHeadIdexControl.vue
index deb46b892d..a10a75acc9 100644
--- a/src/components/widgets/toolhead/ToolHeadIdexControl.vue
+++ b/src/components/widgets/toolhead/ToolHeadIdexControl.vue
@@ -88,6 +88,7 @@
                   spellcheck="false"
                   class="console-command"
                   :class="{ 'mb-3': (i < paramList.length - 1) }"
+                  @focus="$event.target.select()"
                 >
                   <template #append>
                     <app-btn