diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 644e98e59..61d1bc2dc 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -1713,6 +1713,7 @@ Tap the + to start adding people.";
 "spaces_no_room_found_detail" = "Some results may be hidden because they’re private and you need an invite to join them.";
 "spaces_no_member_found_detail" = "Looking for someone not in %@? For now, you can invite them on web or desktop.";
 "spaces_coming_soon_title" = "Coming soon";
+"spaces_add_rooms_coming_soon_title" = "Adding rooms coming soon";
 "spaces_invites_coming_soon_title" = "Invites coming soon";
 "spaces_coming_soon_detail" = "This feature hasn’t been implemented here, but it’s on the way. For now, you can do that with Element on your computer.";
 "space_participants_action_remove" = "Remove from this space";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 6075c2f3a..583ba3136 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -4874,6 +4874,10 @@ internal enum VectorL10n {
   internal static var spaceTag: String { 
     return VectorL10n.tr("Vector", "space_tag") 
   }
+  /// Adding rooms coming soon
+  internal static var spacesAddRoomsComingSoonTitle: String { 
+    return VectorL10n.tr("Vector", "spaces_add_rooms_coming_soon_title") 
+  }
   /// This feature hasn’t been implemented here, but it’s on the way. For now, you can do that with Element on your computer.
   internal static var spacesComingSoonDetail: String { 
     return VectorL10n.tr("Vector", "spaces_coming_soon_detail") 
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
index e87b9c1fd..664493c2e 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
@@ -222,7 +222,7 @@ final class SpaceExploreRoomViewController: UIViewController {
     }
     
     @objc private func addRoomAction(semder: UIView) {
-        self.errorPresenter.presentError(from: self, title: VectorL10n.spacesComingSoonTitle, message: VectorL10n.spacesComingSoonDetail, animated: true, handler: nil)
+        self.errorPresenter.presentError(from: self, title: VectorL10n.spacesAddRoomsComingSoonTitle, message: VectorL10n.spacesComingSoonDetail, animated: true, handler: nil)
     }
 
     // MARK: - UISearchBarDelegate
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
index 815ba5fe8..349530bb9 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
@@ -110,6 +110,8 @@ final class SpaceExploreRoomViewModel: SpaceExploreRoomViewModelType {
                     
                     let avatarViewData = AvatarViewData(matrixItemId: childInfo.childRoomId, displayName: childInfo.displayName, avatarUrl: childInfo.avatarUrl, mediaManager: self.session.mediaManager, fallbackImage: .matrixItem(childInfo.childRoomId, childInfo.name))
                     return SpaceExploreRoomListItemViewData(childInfo: childInfo, avatarViewData: avatarViewData)
+                }).sorted(by: { item1, item2 in
+                    return !item2.childInfo.suggested || item1.childInfo.suggested
                 })
             case .failure(let error):
                 self.update(viewState: .error(error))
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index 35da0cc76..b11621eaa 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -283,6 +283,9 @@
     
     [self initializeDataSources];
     
+    // Need to be called in case of the controllers have been replaced
+    [self.selectedViewController viewWillAppear:NO];
+
     // Adjust the display of the icons in the tabbar.
     for (UITabBarItem *tabBarItem in self.tabBar.items)
     {
@@ -299,6 +302,9 @@
     }
     
     titleView.titleLabel.text = self.selectedViewController.accessibilityLabel;
+    
+    // Need to be called in case of the controllers have been replaced
+    [self.selectedViewController viewDidAppear:NO];
 }
 
 #pragma mark -