diff --git a/platypush/backend/http/webapp/src/components/Action/ActionArgs.vue b/platypush/backend/http/webapp/src/components/Action/ActionArgs.vue
index 89accd0ea2..b142151386 100644
--- a/platypush/backend/http/webapp/src/components/Action/ActionArgs.vue
+++ b/platypush/backend/http/webapp/src/components/Action/ActionArgs.vue
@@ -12,7 +12,7 @@
                                :quote="true"
                                :select-on-tab="false"
                                @input="onArgEdit(name, $event)"
-                               @blur="onSelect(name)"
+                               @blur="onSelect(null)"
                                @focus="onSelect(name)" />
           <span class="required-flag" v-if="action.args[name].required">*</span>
         </label>
diff --git a/platypush/backend/http/webapp/src/components/Action/ActionEditor.vue b/platypush/backend/http/webapp/src/components/Action/ActionEditor.vue
index 95238cd397..2fc56a556d 100644
--- a/platypush/backend/http/webapp/src/components/Action/ActionEditor.vue
+++ b/platypush/backend/http/webapp/src/components/Action/ActionEditor.vue
@@ -429,6 +429,10 @@ export default {
     },
 
     async selectArgdoc(name) {
+      if (!name?.length) {
+        return
+      }
+
       this.selectedArg = name
       this.selectedArgdoc =
         this.actionDocsCache[this.action.name]?.[name]?.html ||