diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index dc4b21a300..cfd359ea01 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -204,6 +204,9 @@ module.exports = React.createClass({
             user_is_in_room = this.state.room.hasMembershipState(
                 MatrixClientPeg.get().credentials.userId, 'join'
             );
+
+            // update the tab complete list now we have a room
+            this._updateTabCompleteList();
         }
 
         if (!user_is_in_room && this.state.roomId) {