diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 2aae23ca9..c79a1b74f 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -234,8 +234,12 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 // as we don't want to forward it in this chat room
                 sharedViewModel.messageToForwardEvent.removeObservers(viewLifecycleOwner)
                 sharedViewModel.messageToForwardEvent.value = Event(chatMessage)
-                Log.i("[Chat Room] Forwarding message, going to chat rooms list")
-                goBack()
+                sharedViewModel.isPendingMessageForward.value = true
+
+                if (sharedViewModel.canSlidingPaneBeClosed.value == true) {
+                    Log.i("[Chat Room] Forwarding message, going to chat rooms list")
+                    sharedViewModel.closeSlidingPaneEvent.value = Event(true)
+                }
             }
         })
 
@@ -400,6 +404,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             it.consume { chatMessage ->
                 Log.i("[Chat Room] Found message to transfer")
                 showForwardConfirmationDialog(chatMessage)
+                sharedViewModel.isPendingMessageForward.value = false
             }
         })
     }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 088a803ce..8236e13ec 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -207,8 +207,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             sharedViewModel.messageToForwardEvent.value?.consume {
                 Log.i("[Chat] Cancelling message forward")
             }
-            listViewModel.forwardPending.value = false
-            adapter.forwardPending(false)
+            sharedViewModel.isPendingMessageForward.value = false
         }
 
         binding.setCancelSharingClickListener {
@@ -279,16 +278,11 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                     }
                 }
             })
-            sharedViewModel.messageToForwardEvent.observe(viewLifecycleOwner, {
-                if (!it.consumed()) {
+            sharedViewModel.isPendingMessageForward.observe(viewLifecycleOwner, {
+                listViewModel.forwardPending.value = it
+                adapter.forwardPending(it)
+                if (it) {
                     Log.i("[Chat] Found chat message to transfer")
-                    // val activity = requireActivity() as MainActivity
-                    // activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
-                    listViewModel.forwardPending.value = true
-                    adapter.forwardPending(true)
-                } else {
-                    listViewModel.forwardPending.value = false
-                    adapter.forwardPending(false)
                 }
             })
 
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
index b30a8042b..21733792d 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
@@ -52,6 +52,8 @@ class SharedMainViewModel : ViewModel() {
         MutableLiveData<Event<ChatMessage>>()
     }
 
+    val isPendingMessageForward = MutableLiveData<Boolean>()
+
     val contentToOpen = MutableLiveData<Content>()
 
     var createEncryptedChatRoom: Boolean = false