diff --git a/src/view/pane/room.js b/src/view/pane/room.js
index d4d4148d..621bfa90 100644
--- a/src/view/pane/room.js
+++ b/src/view/pane/room.js
@@ -119,15 +119,11 @@ Candy.View.Pane = (function(self, $) {
      *   candy:view.room.after-hide using {roomJid, element}
      */
     show: function(roomJid) {
-      var roomId = self.Chat.rooms[roomJid].id,
-        evtData;
+      var roomId = self.Chat.rooms[roomJid].id;
+      var roomObject = Candy.Core.getRoom(roomJid);
 
       $('.room-pane').each(function() {
         var elem = $(this);
-        evtData = {
-          'roomJid': elem.attr('data-roomjid'),
-          'element' : elem
-        };
 
         if(elem.attr('id') === ('chat-room-' + roomId)) {
           elem.show();
@@ -142,11 +138,9 @@ Candy.View.Pane = (function(self, $) {
            * After showing a room
            *
            * Parameters:
-           *   (String) roomJid - Room JID
-           *   (jQuery.Element) element - Room element
+           *   (String) room - Room object
            */
-          $(Candy).triggerHandler('candy:view.room.after-show', evtData);
-
+          $(Candy).triggerHandler('candy:view.room.after-show', { room: roomObject});
         } else {
           elem.hide();
 
@@ -154,10 +148,9 @@ Candy.View.Pane = (function(self, $) {
            * After hiding a room
            *
            * Parameters:
-           *   (String) roomJid - Room JID
-           *   (jQuery.Element) element - Room element
+           *   (String) room - Room object
            */
-          $(Candy).triggerHandler('candy:view.room.after-hide', evtData);
+          $(Candy).triggerHandler('candy:view.room.after-hide', { room: roomObject});
         }
       });
     },