diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index c4e7dae61c..46d2c24853 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -309,8 +309,8 @@ class RoomDetailFragment @Inject constructor(
                     // open share edition
                     onContentAttachmentsReady(sharedData.attachmentData)
                 }
-                null                      -> Timber.v("No share data to process")
-            }
+                null -> Timber.v("No share data to process")
+            }.exhaustive
         }
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt
index b7dfcb26bb..3988643f02 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt
@@ -122,11 +122,13 @@ class IncomingShareViewModel @AssistedInject constructor(
                         val room = session.getRoom(roomId)
                         room?.sendTextMessage(sharedData.text)
                     }
+                    // This is it, pass the first roomId to let the screen open it
+                    _viewEvents.post(IncomingShareViewEvents.MultipleRoomsShareDone(state.selectedRoomIds.first()))
                 }
                 is SharedData.Attachments -> {
                     shareAttachments(sharedData.attachmentData, state.selectedRoomIds, proposeMediaEdition = true, compressMediaBeforeSending = false)
                 }
-            }
+            }.exhaustive
         }
     }