diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index aaa22360a..ce1223a4c 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -41,6 +41,10 @@
         <action
             android:id="@+id/openQuestDetail"
             app:destination="@id/questDetailFragment" />
+        <argument
+            android:name="tabToOpen"
+            app:argType="integer"
+            android:defaultValue="0"/>
     </fragment>
     <fragment
         android:id="@+id/questDetailFragment"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index b06de199b..c001777fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -83,9 +83,13 @@ class PartyFragment : BaseMainFragment() {
         viewPager?.currentItem = 0
 
         setViewPagerAdapter()
-
         setFragments()
 
+        arguments?.let {
+            val args = PartyFragmentArgs.fromBundle(it)
+            viewPager?.currentItem = args.tabToOpen
+        }
+
         this.tutorialStepIdentifier = "party"
         this.tutorialText = getString(R.string.tutorial_party)
     }
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 aaddd0d54..fc30f4666 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
@@ -63,14 +63,13 @@ open class NotificationsViewModel : BaseViewModel() {
      * Custom notification types created by this class (from user data).
      * Will be combined with the notifications coming from server.
      */
-    private val customNotifications: BehaviorSubject<List<Notification>>
+    private val customNotifications: BehaviorSubject<List<Notification>> = BehaviorSubject.create()
 
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
 
     init {
-        customNotifications = BehaviorSubject.create()
         customNotifications.onNext(emptyList())
 
         disposable.add(userRepository.getUser()
@@ -248,7 +247,9 @@ open class NotificationsViewModel : BaseViewModel() {
     private fun clickNewChatMessage(notification: Notification, navController: MainNavigationController) {
         val data = notification.data as? NewChatMessageData
         if (isPartyMessage(data)) {
-            navController.navigate(R.id.partyFragment)
+            val bundle = Bundle()
+            bundle.putString("groupID", data?.group?.id)
+            navController.navigate(R.id.partyFragment, bundle)
         } else {
             val bundle = Bundle()
             bundle.putString("groupID", data?.group?.id)