diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index 4cee1a0bbc..4ce36958c2 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -65,6 +65,12 @@ export default Component.extend(UtilsMixin, {
 
   tabindex: 0,
 
+  keyUp(event) {
+    if (event.keyCode === 32) {
+      event.preventDefault();
+    }
+  },
+
   keyDown(event) {
     if (this.selectKit.isDisabled) {
       return;
@@ -81,11 +87,13 @@ export default Component.extend(UtilsMixin, {
 
     if (event.keyCode === 13) {
       // Enter
-      if (this.selectKit.isExpanded && this.selectKit.highlighted) {
-        this.selectKit.select(this.getValue(this.selectKit.highlighted));
-        return false;
+      if (this.selectKit.isExpanded) {
+        if (this.selectKit.highlighted) {
+          this.selectKit.select(this.getValue(this.selectKit.highlighted));
+          return false;
+        }
       } else {
-        this.selectKit.toggle(event);
+        this.selectKit.close(event);
       }
     } else if (event.keyCode === 38) {
       // Up arrow