diff --git a/src/common-components/input-button-wrapper/input-button-wrapper.vue b/src/common-components/input-button-wrapper/input-button-wrapper.vue
index e8a5e1a2c..0c9907291 100644
--- a/src/common-components/input-button-wrapper/input-button-wrapper.vue
+++ b/src/common-components/input-button-wrapper/input-button-wrapper.vue
@@ -2,6 +2,7 @@
   <label
     :class="[buttonWrapperClasses, { 'has-error': errors.length > 0 }]"
     :for="buttonId"
+    @mousedown.left="handleEventAction('click', $event)"
   >
     selectOnKeypress: {{ selectOnKeypress }}
     <!-- classes: {{classes}}<br/>
@@ -102,57 +103,59 @@ export default {
         hasFirstEventFired: this.hasFirstEventFired,
       });
 
-      switch (eventType) {
-        case eventTypes.CLICK:
-        case eventTypes.KEYPRESS_SUBMIT:
-          console.log("clicking");
-          this.hasFirstEventFired = true;
-          this.handleClick(e);
-          break;
-        case eventTypes.CHANGE:
-          console.log("selectOnKeypress: ", this.selectOnKeypress);
-          this.hasFirstEventFired = false;
-          this.selectOnKeypress
-            ? this.handleClick(e)
-            : this.handleSelectionChange(e);
-          break;
-      }
-
-      // if (this.isMultiSelect) {
-      //   // if (true) {
-      //   switch (eventType) {
-      //     case eventTypes.CLICK:
-      //     case eventTypes.KEYPRESS_SUBMIT:
-      //       console.log("clicking");
-      //       this.hasFirstEventFired = true;
-      //       this.handleClick(e);
-      //       break;
-      //     case eventTypes.CHANGE:
-      //       console.log("selectOnKeypress: ", this.selectOnKeypress);
-      //       this.hasFirstEventFired = false;
-      //       this.selectOnKeypress
-      //         ? this.handleClick(e)
-      //         : this.handleSelectionChange(e);
-      //       break;
-      //   }
-      // } else {
-      //   switch (eventType) {
-      //     case eventTypes.CLICK:
-      //     case eventTypes.KEYPRESS_SUBMIT:
-      //       console.log("clicking");
-      //       this.hasFirstEventFired = true;
-      //       this.handleClick(e);
-      //       break;
-      //     case eventTypes.CHANGE:
-      //       console.log("selectOnKeypress: ", this.selectOnKeypress);
-      //       this.hasFirstEventFired = false;
-      //       this.selectOnKeypress
-      //         ? this.handleClick(e)
-      //         : this.handleSelectionChange(e);
-      //       break;
-      //   }
+      // switch (eventType) {
+      //   case eventTypes.CLICK:
+      //   case eventTypes.KEYPRESS_SUBMIT:
+      //     console.log("clicking");
+      //     this.hasFirstEventFired = true;
+      //     this.handleClick(e);
+      //     break;
+      //   case eventTypes.CHANGE:
+      //     console.log("selectOnKeypress: ", this.selectOnKeypress);
+      //     this.hasFirstEventFired = false;
+      //     this.selectOnKeypress
+      //       ? this.handleClick(e)
+      //       : this.handleSelectionChange(e);
+      //     break;
       // }
 
+      if (this.isMultiSelect) {
+        // if (true) {
+        switch (eventType) {
+          // case eventTypes.CLICK:
+          case eventTypes.KEYPRESS_SUBMIT:
+            console.log("clicking");
+            // this.hasFirstEventFired = true;
+            this.handleClick(e);
+            break;
+          case eventTypes.CHANGE:
+            console.log("selectOnKeypress: ", this.selectOnKeypress);
+            // this.hasFirstEventFired = false;
+            this.selectOnKeypress
+              ? this.handleClick(e)
+              : this.handleSelectionChange(e);
+            break;
+        }
+      } else {
+        switch (eventType) {
+          case eventTypes.CLICK:
+          case eventTypes.KEYPRESS_SUBMIT:
+            console.log("clicking");
+
+            // TODO KO may still need this since GA events, wouldn't want to trigger twice
+            // this.hasFirstEventFired = true;
+            this.handleClick(e);
+            break;
+          case eventTypes.CHANGE:
+            console.log("selectOnKeypress: ", this.selectOnKeypress);
+            // this.hasFirstEventFired = false;
+            this.selectOnKeypress
+              ? this.handleClick(e)
+              : this.handleSelectionChange(e);
+            break;
+        }
+      }
+
       // if (!this.hasFirstEventFired) {
 
       // else {