diff --git a/src/components/ADempiere/Field/FieldNumber.vue b/src/components/ADempiere/Field/FieldNumber.vue
index 8e800c13..6c4ccea1 100644
--- a/src/components/ADempiere/Field/FieldNumber.vue
+++ b/src/components/ADempiere/Field/FieldNumber.vue
@@ -3,7 +3,6 @@
     <el-input-number
       :ref="metadata.columnName"
       v-model="value"
-      v-shortkey="['enter']"
       type="number"
       :min="minValue"
       :max="maxValue"
@@ -13,9 +12,9 @@
       controls-position="right"
       :class="'display-type-amount'"
       @change="preHandleChange"
-      @shortkey.native="changeValue"
       @blur="changeValue"
       @keydown.native="calculateValue"
+      @keyup.enter.native="changeValue"
     />
   </el-tooltip>
 </template>
diff --git a/src/components/ADempiere/Field/popover/calculator.vue b/src/components/ADempiere/Field/popover/calculator.vue
index 9d524d07..34f48f9b 100644
--- a/src/components/ADempiere/Field/popover/calculator.vue
+++ b/src/components/ADempiere/Field/popover/calculator.vue
@@ -7,10 +7,9 @@
       <el-input
         ref="calculatorInput"
         v-model="calcValue"
-        v-shortkey="['enter']"
         class="calc-input"
         @keydown.native="calculateValue"
-        @shortkey.native="changeValue"
+        @keyup.enter.native="changeValue"
       >
         <template slot="append">{{ valueToDisplay }}</template>
       </el-input>