diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6
index 18a36917c..e92e85579 100644
--- a/app/assets/javascripts/discourse/components/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6
@@ -125,9 +125,13 @@ export default Ember.Component.extend({
       clearInterval(this._resizeInterval);
       this._resizeInterval = setInterval(() => {
         Ember.run(() => {
-          const contentHeight = parseInt(this.$('.panel-body-contents').height());
-          if (contentHeight !== this._lastHeight) { this.performLayout(); }
-          this._lastHeight = contentHeight;
+          const $panelBodyContents = this.$('.panel-body-contents');
+
+          if ($panelBodyContents.length) {
+            const contentHeight = parseInt($panelBodyContents.height());
+            if (contentHeight !== this._lastHeight) { this.performLayout(); }
+            this._lastHeight = contentHeight;
+          }
         });
       }, 500);
     }