diff --git a/ui/page/notifications/view.jsx b/ui/page/notifications/view.jsx
index 4ad4f136a..95f390787 100644
--- a/ui/page/notifications/view.jsx
+++ b/ui/page/notifications/view.jsx
@@ -73,13 +73,6 @@ export default function NotificationsPage(props: Props) {
     }
   }, [doCommentReactList, list, activeChannel, fetching, initialFetchDone]);
 
-  React.useEffect(() => {
-    if (unseenCount > 0 || unreadCount > 0) {
-      // If there are unread notifications when entering the page, reset to All.
-      setName(NOTIFICATIONS.NOTIFICATION_NAME_ALL);
-    }
-  }, []);
-
   React.useEffect(() => {
     if (unseenCount > 0) {
       doSeeAllNotifications();
@@ -120,13 +113,7 @@ export default function NotificationsPage(props: Props) {
             <Button icon={ICONS.EYE} onClick={doReadNotifications} button="secondary" label={__('Mark all as read')} />
           )}
           {notificationCategories && (
-            <FormField
-              className="notification__filter"
-              type="select"
-              name="filter"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-            >
+            <FormField type="select" name="filter" value={name} onChange={(e) => setName(e.target.value)}>
               {notificationCategories.map((category) => {
                 return (
                   <option key={category.name} value={category.name}>
@@ -170,7 +157,7 @@ export default function NotificationsPage(props: Props) {
   );
 
   return (
-    <Page>
+    <Page className="notification-page">
       {initialFetchDone ? (
         notificationListElement
       ) : fetching ? (
diff --git a/ui/scss/component/_notification.scss b/ui/scss/component/_notification.scss
index 252ab5013..fe88fb0bb 100644
--- a/ui/scss/component/_notification.scss
+++ b/ui/scss/component/_notification.scss
@@ -279,10 +279,23 @@ $contentMaxWidth: 60rem;
   }
 }
 
-.notification__filter {
-  display: none;
+.notification-page {
+  @media (max-width: $breakpoint-small) {
+    .claim-list__header {
+      display: block;
+    }
 
-  @media (min-width: $breakpoint-small) {
-    display: block;
+    .claim-list__alt-controls--wrap {
+      display: block;
+      text-align: right;
+
+      .button {
+        margin-bottom: var(--spacing-s);
+      }
+
+      fieldset-section {
+        margin-left: 0;
+      }
+    }
   }
 }