diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 0be294d74..d3de10c7e 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -517,6 +517,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
             if (!visible) {
                 return;
             }
+            initRoom(room_id);
             
             var room = $rootScope.events.rooms[room_id];
             if (room) {
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index 8ba817ca6..e35219beb 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -53,6 +53,8 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
 
                     // Add room_alias & room_display_name members
                     angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
+                    
+                    eventHandlerService.setRoomVisibility(room.room_id, "public");
                 }
             }
         );