diff --git a/spec/roomslist.js b/spec/roomslist.js
index 7ade3110d..4880e29e7 100644
--- a/spec/roomslist.js
+++ b/spec/roomslist.js
@@ -75,7 +75,7 @@
             var close_el = _converse.rooms_list_view.el.querySelector(".close-room");
             close_el.click();
             expect(window.confirm).toHaveBeenCalledWith(
-                'Are you sure you want to leave the room ""?');
+                'Are you sure you want to leave the room "lounge"?');
             room_els = _converse.rooms_list_view.el.querySelectorAll(".open-room");
             expect(room_els.length).toBe(0);
             expect(_converse.chatboxes.length).toBe(1);
diff --git a/src/templates/rooms_list_item.html b/src/templates/rooms_list_item.html
index 388f0d36f..e1af31dc6 100644
--- a/src/templates/rooms_list_item.html
+++ b/src/templates/rooms_list_item.html
@@ -2,9 +2,13 @@
 {[ if (num_unread) { ]}
     <span class="msgs-indicator">{{{ num_unread }}}</span>
 {[ } ]}
-<a class="open-room" data-room-jid="{{{jid}}}" title="{{{open_title}}}" href="#">{{{name}}}</a>
+<a class="open-room"
+    data-room-jid="{{{jid}}}"
+    title="{{{open_title}}}" href="#">{{{name}}}</a>
 <a class="right close-room icon-leave"
-   data-room-jid="{{{jid}}}" title="{{{info_leave_room}}}" href="#">&nbsp;</a>
+   data-room-jid="{{{jid}}}"
+   data-room-name="{{{name}}}"
+   title="{{{info_leave_room}}}" href="#">&nbsp;</a>
 <a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}"
    data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}"
    title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a>