diff --git a/js/src/common/components/Badge.js b/js/src/common/components/Badge.js
index 9e73e584d..58c5e9697 100644
--- a/js/src/common/components/Badge.js
+++ b/js/src/common/components/Badge.js
@@ -30,6 +30,6 @@ export default class Badge extends Component {
   config(isInitialized) {
     if (isInitialized) return;
 
-    if (this.props.label) this.$().tooltip({ container: 'body' });
+    if (this.props.label) this.$().tooltip();
   }
 }
diff --git a/less/forum/NotificationList.less b/less/forum/NotificationList.less
index 317923fc8..4b4ee2e77 100644
--- a/less/forum/NotificationList.less
+++ b/less/forum/NotificationList.less
@@ -1,5 +1,6 @@
 
 .NotificationList {
+  overflow: hidden;
   & .loading-indicator {
     height: 100px;
   }
diff --git a/less/forum/NotificationsDropdown.less b/less/forum/NotificationsDropdown.less
index 8d1307a12..3d3564e11 100644
--- a/less/forum/NotificationsDropdown.less
+++ b/less/forum/NotificationsDropdown.less
@@ -1,7 +1,6 @@
 .NotificationsDropdown {
   .Dropdown-menu {
     padding: 0;
-    overflow: hidden;
 
     .NotificationList-content {
       max-height: 70vh;