diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 4d7166e11d8..458e45c93dc 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -112,7 +112,8 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
       $panel.removeClass('drop-down').removeClass('slide-in').addClass(viewMode);
 
       const $panelBody = $('.panel-body', $panel);
-      let contentHeight = parseInt($('.panel-body-contents', $panel).height());
+      // 2 pixel fudge allows for firefox subpixel sizing stuff causing scrollbar
+      let contentHeight = parseInt($('.panel-body-contents', $panel).height()) + 2;
 
       // We use a mutationObserver to check for style changes, so it's important
       // we don't set it if it doesn't change. Same goes for the $panelBody!
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a398bd3002f..1d5c03a476a 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -223,6 +223,9 @@
 .user-menu {
 
   .notifications {
+    width: 100%;
+    display: table;
+
     h3 {
       padding: 0 0.4em;
       font-weight: bold;