diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index 4d5feba17..a3d890234 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -14,8 +14,8 @@
             :value="value"
             :checked="isChecked"
             @blur="handleBlur"
-            @keypress.space="handleEventAction('keypressSubmit', $event)"
-            @keypress.enter="handleEventAction('keypressSubmit', $event)"
+            @keypress.space="handleEventAction('space', $event)"
+            @keypress.enter="handleEventAction('enter', $event)"
             @change="handleEventAction('change', $event)" />
 
         <slot></slot>
@@ -75,13 +75,14 @@ export default {
         handleEventAction(eventType, e) {
             const eventTypes = {
                 CHANGE: "change",
-                KEYPRESS_SUBMIT: "keypressSubmit",
+                ENTER: "enter",
+                SPACE: "space",
                 CLICK: "click",
             };
 
             if (this.isMultiSelect) {
                 switch (eventType) {
-                    case eventTypes.KEYPRESS_SUBMIT:
+                    case eventTypes.ENTER:
                     case eventTypes.CHANGE:
                         this.handleClick(e);
                         window.lastFocusedInputGroup = this.groupName;
@@ -91,7 +92,8 @@ export default {
             } else {
                 switch (eventType) {
                     case eventTypes.CLICK:
-                    case eventTypes.KEYPRESS_SUBMIT:
+                    case eventTypes.ENTER:
+                    case eventTypes.SPACE:
                         this.handleClick(e);
                         this.test();
                         break;