diff --git a/ghost/admin/app/components/gh-token-input/trigger.js b/ghost/admin/app/components/gh-token-input/trigger.js
index ed378d3215..7e0caa7b7f 100644
--- a/ghost/admin/app/components/gh-token-input/trigger.js
+++ b/ghost/admin/app/components/gh-token-input/trigger.js
@@ -12,9 +12,11 @@ export default EmberPowerSelectMultipleTrigger.extend({
         },
 
         handleOptionMouseDown(event) {
-            let action = this.get('extra.optionMouseDown');
-            if (action) {
-                return action(event);
+            if (!event.target.closest('[data-selected-index]')) {
+                let action = this.get('extra.optionMouseDown');
+                if (action) {
+                    return action(event);
+                }
             }
         },
 
diff --git a/ghost/admin/app/templates/components/gh-token-input/trigger.hbs b/ghost/admin/app/templates/components/gh-token-input/trigger.hbs
index afafdd53de..877d0e556d 100644
--- a/ghost/admin/app/templates/components/gh-token-input/trigger.hbs
+++ b/ghost/admin/app/templates/components/gh-token-input/trigger.hbs
@@ -27,7 +27,6 @@
                     aria-label="remove element"
                     class="ember-power-select-multiple-remove-btn"
                     data-selected-index={{idx}}
-                    onmousedown={{action "chooseOption" opt}}
                 >
                     {{svg-jar "close" data-selected-index=idx}}
                 </span>