diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
index c4c3a628b6c..90841ada2db 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
@@ -76,7 +76,13 @@ export default class SelectKitHeader extends Component.extend(UtilsMixin) {
     ) {
       return false;
     }
-    this.selectKit.toggle(event);
+
+    // When users double click on a tag input we want to leave it open
+    const hasInput =
+      event.target.tagName === "INPUT" || event.target.querySelector("input");
+    if (!this.selectKit.isExpanded || !hasInput) {
+      this.selectKit.toggle(event);
+    }
   }
 
   keyUp(event) {