diff --git a/packages/rocketchat-ui/lib/sideNav.coffee b/packages/rocketchat-ui/lib/sideNav.coffee index ebf0c081b7f5964519067833efc512f5cd0d3df6..ade6d678c13616a47eb6435e7c18899c2c1b9cb7 100644 --- a/packages/rocketchat-ui/lib/sideNav.coffee +++ b/packages/rocketchat-ui/lib/sideNav.coffee @@ -78,6 +78,13 @@ focusInput() closeFlex = (callback = null) -> + if not RocketChat.roomTypes.getTypes().filter((i) -> i.route).map((i) -> i.route.name).includes(FlowRouter.current().route.name) + subscription = RocketChat.models.Subscriptions.findOne({rid: Session.get('openedRoom')}) + if subscription? + RocketChat.roomTypes.openRouteLink(subscription.t, subscription, FlowRouter.current().queryParams); + else + FlowRouter.go('home') + return if animating == true toggleArrow -1 toggleFlex -1, callback