diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 6489ef8725..84fea95439 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -345,7 +345,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
   store.dispatch('setLayoutHeight', windowHeight())
 
   FaviconService.initFaviconService()
-  initServiceWorker()
+  initServiceWorker(store)
 
   window.addEventListener('focus', () => updateFocus())
 
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index a1088dff25..a210e19d64 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -159,14 +159,16 @@ const Notifications = {
     updateScrollPosition () {
       this.showScrollTop = this.$refs.root.offsetTop < this.scrollerRef.scrollTop
     },
+    /* "Interacted" really refers to "actionable" notifications that require user input,
+     * everything else (likes/repeats/reacts) cannot be acted and therefore we just clear
+     * the "seen" status upon any clicks on them
+     */
     notificationClicked (notification) {
-      // const { type, id, seen } = notification
+      const { id } = notification
+      this.$store.dispatch('notificationClicked', { id })
     },
     notificationInteracted (notification) {
-      const { id, seen } = notification
-      if (!seen) this.markOneAsSeen(id)
-    },
-    markOneAsSeen (id) {
+      const { id } = notification
       this.$store.dispatch('markSingleNotificationAsSeen', { id })
     },
     markAsSeen () {
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index 9b91f29129..febff48868 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -113,6 +113,21 @@ export const notifications = {
         }
       })
     },
+    notificationClicked ({ state, commit }, id) {
+      const notification = state.idStore[id]
+      const { type, seen } = notification
+
+      if (!seen) {
+        switch (type) {
+          case 'mention':
+          case 'pleroma:report':
+          case 'follow_request':
+            break
+          default:
+            commit('markSingleNotificationAsSeen', { id })
+        }
+      }
+    },
     setNotificationsLoading ({ rootState, commit }, { value }) {
       commit('setNotificationsLoading', { value })
     },
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index d4ae8f4fe4..e28f91685c 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -82,12 +82,18 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
     return responseData
   })
 }
-export async function initServiceWorker () {
+export async function initServiceWorker (store) {
   if (!isSWSupported()) return
   await getOrCreateServiceWorker()
   navigator.serviceWorker.addEventListener('message', (event) => {
+    const { dispatch } = store
     console.log('SW MESSAGE', event)
-    // TODO actually act upon click (open drawer on mobile, open chat/thread etc)
+    const { type, ...rest } = event
+
+    switch (type) {
+      case 'notificationClicked':
+        dispatch('notificationClicked', { id: rest.id })
+    }
   })
 }