diff --git a/src/app/components/shared/room-join/room-join.component.html b/src/app/components/shared/room-join/room-join.component.html
index a4ccf58376bf99fc437bb2cd31e7fffb41363c59..689e58c05c489f4fc27abe14d06e52be305faf3f 100644
--- a/src/app/components/shared/room-join/room-join.component.html
+++ b/src/app/components/shared/room-join/room-join.component.html
@@ -1,7 +1,7 @@
 <div fxLayout="column" fxLayoutAlign="center center" fxlayoutgap="50px" fxFill>
 <form (ngSubmit)="joinRoom(roomId.value)">
   <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
-    <mat-form-field>
+    <mat-form-field (keyup.enter)="onEnter()">
       <input matInput #roomId type="text" pattern="[0-9 ]*" inputmode="numeric" min="00000000" max="99999999"
              onkeydown="if(this.value.length - (this.value.split(' ').length -1) === 8 && event.keyCode != 8) return false;
                         if(this.value.length === 4 && event.keyCode != 8) this.value = this.value + ' ';"
diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
index e3508026a82e6f3e23a13c43345e08abe3549ef0..0eff89b6bddb5d506b2124d12df54cb72627d410 100644
--- a/src/app/components/shared/room-join/room-join.component.ts
+++ b/src/app/components/shared/room-join/room-join.component.ts
@@ -46,6 +46,10 @@ export class RoomJoinComponent implements OnInit {
     this.authenticationService.watchUser.subscribe(newUser => this.user = newUser);
   }
 
+  onEnter() {
+    this.getRoom(this.roomIdElement.nativeElement.value);
+  }
+
   getRoom(id: string): void {
     if (id.length - (id.split(' ').length - 1) < 8) {
       this.translateService.get('home-page.exactly-8').subscribe(message => {