diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js
index b32355ef..1194bff4 100644
--- a/src/domain/session/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -124,6 +124,8 @@ export class SessionViewModel extends ViewModel {
     _updateGrid(roomIds) {
         const changed = !(this._gridViewModel && roomIds);
         const currentRoomId = this.navigation.path.get("room");
+        // Close right-panel if needed
+        this._toggleRoomInformationPanel();
         if (roomIds) {
             if (!this._gridViewModel) {
                 this._gridViewModel = this.track(new RoomGridViewModel(this.childOptions({