diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index f57ba45cf..f44fe613d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -318,6 +318,14 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
             messageText: CharSequence): View? {
         val item = inflater?.inflate(R.layout.notification_item_actionable, notification_items, false)
 
+        val container = item?.findViewById(R.id.notification_item) as? View
+        container?.setOnClickListener {
+            val resultIntent = Intent()
+            resultIntent.putExtra("notificationId", notification.id)
+            setResult(NOTIFICATION_CLICK, resultIntent)
+            finish()
+        }
+
         val acceptButton = item?.findViewById(R.id.accept_button) as? Button
         acceptButton?.setOnClickListener {
             val resultIntent = Intent()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index 368348705..6c1a19469 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -222,14 +222,21 @@ open class NotificationsViewModel : BaseViewModel() {
                 .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
     }
 
+    private fun findNotification(id: String): Notification? {
+        return notificationsManager.getNotification(id) ?: customNotifications.value?.find { it.id == id }
+    }
+
     fun click(notificationId: String, navController: MainNavigationController) {
-        val notification = notificationsManager.getNotification(notificationId) ?: return
+        val notification = findNotification(notificationId) ?: return
 
         dismissNotification(notification)
 
         when (notification.type) {
             Notification.Type.NEW_STUFF.type -> navController.navigate(R.id.newsFragment)
             Notification.Type.NEW_CHAT_MESSAGE.type -> clickNewChatMessage(notification, navController)
+            Notification.Type.GUILD_INVITATION.type -> clickGroupInvitation(notification, navController)
+            Notification.Type.PARTY_INVITATION.type -> clickGroupInvitation(notification, navController)
+            Notification.Type.QUEST_INVITATION.type -> navController.navigate(R.id.partyFragment)
             Notification.Type.NEW_MYSTERY_ITEMS.type -> navController.navigate(R.id.itemsFragment, bundleOf(Pair("itemType", "special")))
             Notification.Type.UNALLOCATED_STATS_POINTS.type -> navController.navigate(R.id.statsFragment)
             // Group tasks should go to Group tasks view if that is added to this app at some point
@@ -251,33 +258,46 @@ open class NotificationsViewModel : BaseViewModel() {
         }
     }
 
-    fun accept(notificationId: String) {
-        val notification = customNotifications.value?.find { it.id == notificationId } ?: return
-
+    fun clickGroupInvitation(notification: Notification, navController: MainNavigationController) {
         when (notification.type) {
             Notification.Type.GUILD_INVITATION.type -> {
-                val data = notification.data as GuildInvitationData
-                acceptGroupInvitation(data.invitation?.id)
+                val bundle = Bundle()
+                val data = notification.data as? GuildInvitationData
+                bundle.putString("groupID", data?.invitation?.id)
+                bundle.putBoolean("isMember", true) // safe to assume user is member since they got the notification
+                navController.navigate(R.id.guildFragment, bundle)
             }
             Notification.Type.PARTY_INVITATION.type -> {
-                val data = notification.data as PartyInvitationData
-                acceptGroupInvitation(data.invitation?.id)
+                navController.navigate(R.id.partyFragment)
+            }
+        }
+    }
+
+    fun accept(notificationId: String) {
+        val notification = findNotification(notificationId) ?: return
+        when (notification.type) {
+            Notification.Type.GUILD_INVITATION.type -> {
+                val data = notification.data as? GuildInvitationData
+                acceptGroupInvitation(data?.invitation?.id)
+            }
+            Notification.Type.PARTY_INVITATION.type -> {
+                val data = notification.data as? PartyInvitationData
+                acceptGroupInvitation(data?.invitation?.id)
             }
             Notification.Type.QUEST_INVITATION.type -> acceptQuestInvitation()
         }
     }
 
     fun reject(notificationId: String) {
-        val notification = customNotifications.value?.find { it.id == notificationId } ?: return
-
+        val notification = findNotification(notificationId) ?: return
         when (notification.type) {
             Notification.Type.GUILD_INVITATION.type -> {
-                val data = notification.data as GuildInvitationData
-                rejectGroupInvite(data.invitation?.id)
+                val data = notification.data as? GuildInvitationData
+                rejectGroupInvite(data?.invitation?.id)
             }
             Notification.Type.PARTY_INVITATION.type -> {
-                val data = notification.data as PartyInvitationData
-                rejectGroupInvite(data.invitation?.id)
+                val data = notification.data as? PartyInvitationData
+                rejectGroupInvite(data?.invitation?.id)
             }
             Notification.Type.QUEST_INVITATION.type -> rejectQuestInvitation()
         }