diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js
index b9844438a..7686bbeb9 100644
--- a/client/components/cards/cardCustomFields.js
+++ b/client/components/cards/cardCustomFields.js
@@ -279,9 +279,7 @@ CardCustomField.register('cardCustomField');
           if (event.keyCode === 13) {
             event.preventDefault();
 
-            if (event.metaKey || event.ctrlKey) {
-              this.find('button[type=submit]').click();
-            } else if (event.target.value.trim()) {
+            if (event.target.value.trim() || event.metaKey || event.ctrlKey) {
               const inputLast = this.find('input.last');
 
               let items = this.getItems();
@@ -307,6 +305,9 @@ CardCustomField.register('cardCustomField');
 
               this.stringtemplateItems.set(items);
             }
+            if (event.metaKey || event.ctrlKey) {
+              this.find('button[type=submit]').click();
+            }
           }
         },