diff --git a/src/components/Home.vue b/src/components/Home.vue
index 03dabbd..9109fa0 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="pa-4">
-    <RoomList showInvites />
+    <RoomList showInvites showCreate :title="$t('room.room_list_rooms')" :invitesTitle="$t('room.room_list_invites')" v-on:newroom="createRoom" />
     <v-btn block depressed class="outlined-button" @click.stop="logout">{{$t('menu.logout')}}</v-btn>
 
     <!-- Loading indicator -->
@@ -42,6 +42,10 @@ export default {
         this.$navigation.push({path: "/login"}, -1);
       })
     },
+    
+    createRoom() {
+      this.$navigation.push({ name: "CreateRoom" });
+    }
   }
 };
 </script>
diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index ea1bcc8..1011331 100644
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -1,6 +1,6 @@
 <template>
   <v-list dense class="room-list">
-    <div v-if="showInvites" class="h4">{{invitesTitle}}</div>
+    <div v-if="showInvites && $matrix.invites.length > 0" class="h4">{{invitesTitle}}</div>
     <v-list-item-group v-if="showInvites" v-model="currentRoomId" color="primary">
       <v-slide-y-transition group>
       <v-list-item :disabled="roomsProcessing[room.roomId]" v-for="room in $matrix.invites" :key="room.roomId" :value="room.roomId">
@@ -116,6 +116,10 @@ export default {
 
   watch: {
     currentRoomId() {
+      if (this.currentRoomId == null) {
+        // Ignore, this is caused by "new room" etc.
+        return;
+      }
       this.$emit("close");
       this.$navigation.push({name: 'Chat', params: { roomId: util.sanitizeRoomId(this.currentRoomId) }}, -1);
     },