diff --git a/app/assets/javascripts/discourse/components/categorydrop_component.js b/app/assets/javascripts/discourse/components/categorydrop_component.js
index 5aa2e354b4e..f3e17b55711 100644
--- a/app/assets/javascripts/discourse/components/categorydrop_component.js
+++ b/app/assets/javascripts/discourse/components/categorydrop_component.js
@@ -69,10 +69,6 @@ Discourse.CategoryDropComponent = Ember.Component.extend({
     }
   },
 
-  categoryChanged: function() {
-    this.close();
-  }.observes('category', 'parentCategory'),
-
   close: function() {
     $('html').off('click.category-drop');
     this.$('a[data-drop-close]').off('click.category-drop');
diff --git a/app/assets/javascripts/discourse/lib/html.js b/app/assets/javascripts/discourse/lib/html.js
index 5269b6234c2..f3b21f0ef48 100644
--- a/app/assets/javascripts/discourse/lib/html.js
+++ b/app/assets/javascripts/discourse/lib/html.js
@@ -50,7 +50,7 @@ Discourse.HTML = {
         restricted = Em.get(category, 'read_restricted'),
         html = "<a href=\"" + Discourse.getURL("/category/") + Discourse.Category.slugFor(category) + "\" ";
 
-    html += "class=\"badge-category" + (restricted ? ' restricted' : '' ) + "\" ";
+    html += "data-drop-close=\"true\" class=\"badge-category" + (restricted ? ' restricted' : '' ) + "\" ";
 
     // Add description if we have it
     if (description) html += "title=\"" + Handlebars.Utils.escapeExpression(description) + "\" ";