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 4911fc9ac..8d243053e 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
@@ -178,6 +178,13 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             listViewModel.forwardPending.value = false
         }
 
+        binding.setCancelSharingClickListener {
+            Log.i("[Chat] Cancelling text/files sharing")
+            sharedViewModel.textToShare.value = ""
+            sharedViewModel.filesToShare.value = arrayListOf()
+            listViewModel.sharingPending.value = false
+        }
+
         binding.setNewOneToOneChatRoomClickListener {
             sharedViewModel.chatRoomParticipants.value = arrayListOf()
             navigateToChatRoomCreation(false)
@@ -216,6 +223,11 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                     Log.i("[Chat] Found text to share")
                     val activity = requireActivity() as MainActivity
                     activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
+                    listViewModel.sharingPending.value = true
+                } else {
+                    if (sharedViewModel.filesToShare.value.isNullOrEmpty()) {
+                        listViewModel.sharingPending.value = false
+                    }
                 }
             })
             sharedViewModel.filesToShare.observe(viewLifecycleOwner, {
@@ -223,6 +235,11 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                     Log.i("[Chat] Found ${it.size} files to share")
                     val activity = requireActivity() as MainActivity
                     activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
+                    listViewModel.sharingPending.value = true
+                } else {
+                    if (sharedViewModel.textToShare.value.isNullOrEmpty()) {
+                        listViewModel.sharingPending.value = false
+                    }
                 }
             })
             sharedViewModel.messageToForwardEvent.observe(viewLifecycleOwner, {
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
index a5f0f95ad..74d22a723 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
@@ -39,6 +39,8 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
         MutableLiveData<Event<Boolean>>()
     }
 
+    val sharingPending = MutableLiveData<Boolean>()
+
     val forwardPending = MutableLiveData<Boolean>()
 
     val groupChatAvailable: Boolean = LinphoneUtils.isGroupChatAvailable()
diff --git a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
index 013f3e278..63bb0f46f 100644
--- a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
@@ -17,6 +17,9 @@
         <variable
             name="cancelForwardClickListener"
             type="android.view.View.OnClickListener" />
+        <variable
+            name="cancelSharingClickListener"
+            type="android.view.View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel" />
@@ -54,6 +57,17 @@
                         android:padding="15dp"
                         android:src="@drawable/cancel_edit" />
 
+                    <ImageView
+                        android:onClick="@{cancelSharingClickListener}"
+                        android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE}"
+                        android:contentDescription="@string/content_description_cancel_contact_edit"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.2"
+                        android:background="?attr/button_background_drawable"
+                        android:padding="15dp"
+                        android:src="@drawable/cancel_edit" />
+
                     <ImageView
                         android:onClick="@{newOneToOneChatRoomClickListener}"
                         android:contentDescription="@string/content_description_create_one_to_one_chat_room"
@@ -83,7 +97,7 @@
                     <ImageView
                         android:onClick="@{editClickListener}"
                         android:enabled="@{!viewModel.chatRooms.empty}"
-                        android:visibility="@{viewModel.forwardPending ? View.GONE : View.VISIBLE}"
+                        android:visibility="@{viewModel.forwardPending || viewModel.sharingPending ? View.GONE : View.VISIBLE}"
                         android:contentDescription="@string/content_description_enter_edition_mode"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/chat_room_master_fragment.xml b/app/src/main/res/layout/chat_room_master_fragment.xml
index 51179afe2..63e461bad 100644
--- a/app/src/main/res/layout/chat_room_master_fragment.xml
+++ b/app/src/main/res/layout/chat_room_master_fragment.xml
@@ -16,6 +16,9 @@
         <variable
             name="cancelForwardClickListener"
             type="android.view.View.OnClickListener" />
+        <variable
+            name="cancelSharingClickListener"
+            type="android.view.View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel" />
@@ -43,6 +46,17 @@
                 android:padding="15dp"
                 android:src="@drawable/cancel_edit" />
 
+            <ImageView
+                android:onClick="@{cancelSharingClickListener}"
+                android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE}"
+                android:contentDescription="@string/content_description_cancel_contact_edit"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="?attr/button_background_drawable"
+                android:padding="15dp"
+                android:src="@drawable/cancel_edit" />
+
             <ImageView
                 android:onClick="@{newOneToOneChatRoomClickListener}"
                 android:contentDescription="@string/content_description_create_one_to_one_chat_room"
@@ -72,7 +86,7 @@
             <ImageView
                 android:onClick="@{editClickListener}"
                 android:enabled="@{!viewModel.chatRooms.empty}"
-                android:visibility="@{viewModel.forwardPending ? View.GONE : View.VISIBLE}"
+                android:visibility="@{viewModel.forwardPending || viewModel.sharingPending ? View.GONE : View.VISIBLE}"
                 android:contentDescription="@string/content_description_enter_edition_mode"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"