diff --git a/tests/functional/labels-auth.js b/tests/functional/labels-auth.js
index f4767de8d..ecc7bf257 100644
--- a/tests/functional/labels-auth.js
+++ b/tests/functional/labels-auth.js
@@ -93,6 +93,27 @@ define(
               assert.notInclude("is-active", className);
             })
             .end();
+        },
+
+        "Clicking close button actually closes it?": function() {
+          return FunctionalHelpers.openPage(
+            this,
+            url("/issues/2"),
+            ".js-LabelEditorLauncher",
+            true /* longerTimeout */
+          )
+            .findByCssSelector(".js-LabelEditorLauncher")
+            .click()
+            .end()
+            .findByCssSelector(".js-LabelEditor-close")
+            .click()
+            .end()
+            .findByCssSelector(".js-LabelEditorLauncher")
+            .getAttribute("class")
+            .then(function(className) {
+              assert.notInclude("is-active", className);
+            })
+            .end();
         }
       };
     });
diff --git a/webcompat/static/js/lib/labels.js b/webcompat/static/js/lib/labels.js
index 116a12bdc..899bc605e 100644
--- a/webcompat/static/js/lib/labels.js
+++ b/webcompat/static/js/lib/labels.js
@@ -175,7 +175,7 @@ issues.LabelEditorView = Backbone.View.extend({
     this.reRender({ labels: _.uniq(modelUpdate) });
   },
   closeEditor: function(e) {
-    if (!e || (e && e.keyCode === 27)) {
+    if (!e || (e && (e.keyCode === 27 || !e.keyCode))) {
       var checked = $("input[type=checkbox]:checked");
       var labelsArray = _.pluck(checked, "name");
       this.issueView.editorButton.removeClass("is-active");
diff --git a/webcompat/static/js/templates.js b/webcompat/static/js/templates.js
index ba0882dca..6586e62fa 100644
--- a/webcompat/static/js/templates.js
+++ b/webcompat/static/js/templates.js
@@ -28,4 +28,4 @@ this["wcTmpl"]["list-issue/issuelist-sorting.jst"] = function(obj) {obj || (obj
 
 this["wcTmpl"]["web_modules/issue-list.jst"] = function(obj) {obj || (obj = {});var __t, __p = '', __e = _.escape, __j = Array.prototype.join;function print() { __p += __j.call(arguments, '') }with (obj) { if (issues.length) { ;__p += '\n    '; _.each(issues, function(issue) { ;__p += '\n      <article class="wc-IssueList wc-IssueList--' +((__t = ( issue.stateClass )) == null ? '' : __t) +' wc-IssueList--large js-IssueList">\n        <div class="wc-IssueList-section">\n          <header class="wc-IssueList-header">\n            <a class="wc-Link" href="/issues/' +((__t = ( issue.number )) == null ? '' : __t) +'">\n              <span class="wc-IssueList-count">Issue ' +((__t = ( issue.number )) == null ? '' : __t) +'</span>: ' +__e( issue.title ) +'\n            </a>\n          </header>\n          <p>\n            <span class="wc-IssueList-metadata">Opened: <time>' +((__t = ( issue.createdAt )) == null ? '' : __t) +'</time></span>\n            <span class="wc-IssueList-metadata">Comments: ' +((__t = ( issue.commentNumber )) == null ? '' : __t) +'</span>\n          </p>\n        </div>\n        <div class="wc-IssueList-section">\n          <span class="wc-IssueList-label js-Issue-label">\n          '; _.each(issue.labels, function(label) { ;__p += '\n            <a href="/issues?q=label:' +((__t = ( label.remoteName )) == null ? '' : __t) +'"\n               class="wc-Labels" data-remotename="' +((__t = ( label.remoteName )) == null ? '' : __t) +'"\n               title="Labels : ' +((__t = ( label.name )) == null ? '' : __t) +'">' +((__t = ( label.name )) == null ? '' : __t) +'</a>\n          '; }); ;__p += '</span>\n        </div>\n      </article>\n    '; }); ;__p += '\n  '; } else { ;__p += '\n  <p>Nothing here currently, go report something!</p>\n'; } ;}return __p};
 
-this["wcTmpl"]["web_modules/label-editor.jst"] = function(obj) {obj || (obj = {});var __t, __p = '', __e = _.escape, __j = Array.prototype.join;function print() { __p += __j.call(arguments, '') }with (obj) {__p += '<div class="wc-LabelEditor-header">\n    <input class="form-control wc-LabelEditor-search" placeholder="filter label">\n    <button class="wc-LabelEditor-button r-ResetButton" tabindex="0">\n      Save &amp; Close\n    </button>\n  </div>\n  <div class="wc-LabelEditor-list" tabindex="-1">\n    '; _.each(labels, function(label) { ;__p += '\n      <label class="wc-LabelEditor-list-item" tabindex="0">\n        <span class="wc-LabelEditor-list-item-squareColor"\n              style="background-color:#' +((__t = (label.color)) == null ? '' : __t) +'">\n          <input class="wc-LabelEditor-list-item-checkbox"\n                 type="checkbox" name="' +((__t = ( label.name )) == null ? '' : __t) +'"\n                 data-color="' +((__t = (label.color)) == null ? '' : __t) +'"\n                 data-remotename="' +((__t = ( label.remoteName )) == null ? '' : __t) +'"\n                 tabindex="-1">\n        </span>\n        <span class="wc-LabelEditor-list-item-name">' +((__t = ( label.name )) == null ? '' : __t) +'</span>\n      </label>\n    '; }); ;__p += '\n  </div>';}return __p};
\ No newline at end of file
+this["wcTmpl"]["web_modules/label-editor.jst"] = function(obj) {obj || (obj = {});var __t, __p = '', __e = _.escape, __j = Array.prototype.join;function print() { __p += __j.call(arguments, '') }with (obj) {__p += '<div class="wc-LabelEditor-header">\n    <input class="form-control wc-LabelEditor-search" placeholder="filter label">\n    <button class="wc-LabelEditor-button r-ResetButton js-LabelEditor-close"\n            tabindex="0">\n      Save &amp; Close\n    </button>\n  </div>\n  <div class="wc-LabelEditor-list" tabindex="-1">\n    '; _.each(labels, function(label) { ;__p += '\n      <label class="wc-LabelEditor-list-item" tabindex="0">\n        <span class="wc-LabelEditor-list-item-squareColor"\n              style="background-color:#' +((__t = (label.color)) == null ? '' : __t) +'">\n          <input class="wc-LabelEditor-list-item-checkbox"\n                 type="checkbox" name="' +((__t = ( label.name )) == null ? '' : __t) +'"\n                 data-color="' +((__t = (label.color)) == null ? '' : __t) +'"\n                 data-remotename="' +((__t = ( label.remoteName )) == null ? '' : __t) +'"\n                 tabindex="-1">\n        </span>\n        <span class="wc-LabelEditor-list-item-name">' +((__t = ( label.name )) == null ? '' : __t) +'</span>\n      </label>\n    '; }); ;__p += '\n  </div>';}return __p};
\ No newline at end of file
diff --git a/webcompat/templates/web_modules/label-editor.jst b/webcompat/templates/web_modules/label-editor.jst
index b25d3223e..336edfd1d 100644
--- a/webcompat/templates/web_modules/label-editor.jst
+++ b/webcompat/templates/web_modules/label-editor.jst
@@ -1,7 +1,8 @@
 <script type="text/template">
   <div class="wc-LabelEditor-header">
     <input class="form-control wc-LabelEditor-search" placeholder="filter label">
-    <button class="wc-LabelEditor-button r-ResetButton" tabindex="0">
+    <button class="wc-LabelEditor-button r-ResetButton js-LabelEditor-close"
+            tabindex="0">
       Save &amp; Close
     </button>
   </div>