diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index b1228e728e5..4a6f2b21c84 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -75,7 +75,6 @@ export default createWidget('user-menu', {
     return [this.attach('user-menu-links', { path }),
             this.attach('user-notifications', { path }),
             h('div.logout-link', [
-              h('hr'),
               h('ul.menu-links',
                 h('li', this.attach('link', { action: 'logout',
                                                        className: 'logout',
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
index 8d3e710a0d1..6c1b1f06529 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
@@ -67,13 +67,17 @@ export default createWidget('user-notifications', {
       const href = `${attrs.path}/notifications`;
 
       result.push(h('hr'));
-      result.push(h('ul', [
-                    notificationItems,
-                    h('li.read.last.heading',
-                      h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])
-                    )
-                  ]));
 
+      const items = [notificationItems]
+
+      if (notificationItems.length > 0) {
+        items.push(
+          h('li.read.last.heading', h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])),
+          h('hr')
+        );
+      }
+
+      result.push(h('ul', items));
     }
 
     return result;