diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 674ad8f9431..a8f2580e8c7 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -75,7 +75,14 @@ export default Ember.Component.extend({
 
           this.$(".drop a").on("click", () => {
             this.$(".drop").hide();
-            this.set("expanded", false);
+
+            Ember.run.next(() => {
+              if (!this.element || this.isDestroying || this.isDestroyed) {
+                return;
+              }
+              this.set("expanded", false);
+            });
+
             return true;
           });