diff --git a/CHANGES.md b/CHANGES.md
index 71a2bd4616..d26237fd13 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Implementation of /join command
 
 Bugfix 🐛:
  -  Message transitions in encrypted rooms are jarring #518
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 ad4e9694db..e67c27bd49 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
@@ -292,16 +292,23 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.Failure             -> showErrorInSnackbar(it.throwable)
                 is RoomDetailViewEvents.OnNewTimelineEvents -> scrollOnNewMessageCallback.addNewTimelineEventIds(it.eventIds)
                 is RoomDetailViewEvents.ActionSuccess       -> displayRoomDetailActionSuccess(it)
-                is RoomDetailViewEvents.ActionFailure       -> displayRoomDetailActionFailure(it)
-                is RoomDetailViewEvents.ShowMessage         -> showSnackWithMessage(it.message, Snackbar.LENGTH_LONG)
-                is RoomDetailViewEvents.NavigateToEvent     -> navigateToEvent(it)
-                is RoomDetailViewEvents.FileTooBigError     -> displayFileTooBigError(it)
-                is RoomDetailViewEvents.DownloadFileState   -> handleDownloadFileState(it)
-                is RoomDetailViewEvents.SendMessageResult   -> renderSendMessageResult(it)
+                is RoomDetailViewEvents.ActionFailure         -> displayRoomDetailActionFailure(it)
+                is RoomDetailViewEvents.ShowMessage           -> showSnackWithMessage(it.message, Snackbar.LENGTH_LONG)
+                is RoomDetailViewEvents.NavigateToEvent       -> navigateToEvent(it)
+                is RoomDetailViewEvents.FileTooBigError       -> displayFileTooBigError(it)
+                is RoomDetailViewEvents.DownloadFileState     -> handleDownloadFileState(it)
+                is RoomDetailViewEvents.JoinRoomCommandSucces -> handleJoinedToAnotherRoom(it)
+                is RoomDetailViewEvents.SendMessageResult     -> renderSendMessageResult(it)
             }.exhaustive
         }
     }
 
+    private fun handleJoinedToAnotherRoom(action: RoomDetailViewEvents.JoinRoomCommandSucces) {
+        updateComposerText("")
+        lockSendButton = false
+        navigator.openRoom(vectorBaseActivity, action.roomId)
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (savedInstanceState == null) {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
index fcbe7f37c0..20657a1e42 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
@@ -50,6 +50,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     abstract class SendMessageResult : RoomDetailViewEvents()
 
     object MessageSent : SendMessageResult()
+    data class JoinRoomCommandSucces(val roomId: String) : SendMessageResult()
     class SlashCommandError(val command: Command) : SendMessageResult()
     class SlashCommandUnknown(val command: String) : SendMessageResult()
     data class SlashCommandHandled(@StringRes val messageRes: Int? = null) : SendMessageResult()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
index 4ab9125c4f..4991a9ca01 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@@ -379,8 +379,8 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandNotImplemented)
                         }
                         is ParsedCommand.JoinRoom                 -> {
-                            // TODO
-                            _viewEvents.post(RoomDetailViewEvents.SlashCommandNotImplemented)
+                            handleJoinToAnotherRoomSlashCommand(slashCommandResult)
+                            popDraft()
                         }
                         is ParsedCommand.PartRoom                 -> {
                             // TODO
@@ -512,6 +512,22 @@ class RoomDetailViewModel @AssistedInject constructor(
         room.deleteDraft(NoOpMatrixCallback())
     }
 
+    private fun handleJoinToAnotherRoomSlashCommand(command: ParsedCommand.JoinRoom) {
+        session.joinRoom(command.roomAlias, command.reason, object : MatrixCallback<Unit> {
+            override fun onSuccess(data: Unit) {
+                session.getRoomSummary(command.roomAlias)
+                        ?.roomId
+                        ?.let {
+                            _viewEvents.post(RoomDetailViewEvents.JoinRoomCommandSucces(it))
+                        }
+            }
+
+            override fun onFailure(failure: Throwable) {
+                _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+            }
+        })
+    }
+
     private fun legacyRiotQuoteText(quotedText: String?, myText: String): String {
         val messageParagraphs = quotedText?.split("\n\n".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
         return buildString {