diff --git a/src/rooms/SpaceDrawer.qml b/src/rooms/SpaceDrawer.qml
index 1c1a4fd2c..add0db0e5 100644
--- a/src/rooms/SpaceDrawer.qml
+++ b/src/rooms/SpaceDrawer.qml
@@ -24,10 +24,6 @@ QQC2.Control {
     topPadding: 0
     bottomPadding: 0
 
-    onActiveFocusChanged: if (activeFocus) {
-        notificationsButton.forceActiveFocus();
-    }
-
     contentItem: ColumnLayout {
         spacing: 0
 
@@ -49,38 +45,6 @@ QQC2.Control {
                 width: scrollView.width
                 spacing: 0
 
-                AvatarTabButton {
-                    id: notificationsButton
-
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: width - Kirigami.Units.smallSpacing
-                    Layout.maximumHeight: width - Kirigami.Units.smallSpacing
-                    Layout.topMargin: Kirigami.Units.smallSpacing / 2
-                    Layout.bottomMargin: Kirigami.Units.smallSpacing / 2
-                    text: i18n("View notifications")
-                    contentItem: Kirigami.Icon {
-                        source: "notifications"
-                    }
-                    visible: !Kirigami.Settings.isMobile // Shows up in the mobile bar instead
-
-                    activeFocusOnTab: true
-
-                    onSelected: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'NotificationsView'), {
-                        connection: root.connection
-                    }, {
-                        title: i18nc("@title", "Notifications"),
-                        modality: Qt.NonModal
-                    })
-                }
-
-                Kirigami.Separator {
-                    visible: notificationsButton.visible
-
-                    Layout.fillWidth: true
-                    Layout.leftMargin: Kirigami.Units.smallSpacing
-                    Layout.rightMargin: Kirigami.Units.smallSpacing
-                }
-
                 AvatarTabButton {
                     id: allRoomButton
 
diff --git a/src/rooms/UserInfo.qml b/src/rooms/UserInfo.qml
index c15756091..2fb89c140 100644
--- a/src/rooms/UserInfo.qml
+++ b/src/rooms/UserInfo.qml
@@ -89,6 +89,23 @@ RowLayout {
             window: QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow
         }
     }
+    
+    QQC2.ToolButton {
+        display: QQC2.Button.IconOnly
+        text: i18n("View notifications")
+        icon.name: "notifications"
+        onClicked: (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'NotificationsView'), {
+            connection: root.connection
+        }, {
+            title: i18nc("@title", "Notifications"),
+            modality: Qt.NonModal
+        })
+
+        QQC2.ToolTip.text: text
+        QQC2.ToolTip.visible: hovered
+        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    }
+    
     QQC2.ToolButton {
         display: QQC2.Button.IconOnly
         text: i18nc("@action:button", "Open Settings")