diff --git a/src/app/join-room/join-room.component.html b/src/app/join-room/join-room.component.html
index db4f112125a3983e37a3d173f894dda1c9565a84..b83074bb67bafa4341c849833a5fab00004ec528 100644
--- a/src/app/join-room/join-room.component.html
+++ b/src/app/join-room/join-room.component.html
@@ -1,8 +1,7 @@
 <form>
   <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
     <mat-form-field class="input-block">
-      <input matInput #roomId placeholder="Room-Id"/>
-
+      <input matInput #roomId placeholder="Room-Id" (keypress)="reset()"/>
     </mat-form-field>
     <button mat-fab color="primary" (click)="joinRoom(roomId.value)">
       <mat-icon>send</mat-icon>
diff --git a/src/app/join-room/join-room.component.ts b/src/app/join-room/join-room.component.ts
index 0f9c3d78d2c1b32c16bcae699981606b6d67124e..eb64ee25aca27d4e4c063dd6bb7348d3e7c48188 100644
--- a/src/app/join-room/join-room.component.ts
+++ b/src/app/join-room/join-room.component.ts
@@ -44,4 +44,9 @@ export class JoinRoomComponent implements OnInit {
       this.notificationService.show('No room-id entered.');
     }
   }
+
+  reset(): void {
+    this.isExisting = true;
+    this.noInput = false;
+  }
 }