diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 44b86dafb919ba4d3cbf2b37c742ec45122941bb..cf0d78fb21c73226dd07370070cdcee25faa9bd6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -25,8 +25,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { LanguageService } from './services/util/language.service';
 import { MarkdownService, MarkedOptions } from 'ngx-markdown';
 import { NewLandingComponent } from './components/home/new-landing/new-landing.component';
-import { RoomCreateComponent } from './components/creator/_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from './components/home/_dialogs/room-create/room-create.component';
 import { HomePageComponent } from './components/home/home-page/home-page.component';
+import {RoomJoinComponent} from "./components/home/room-join/room-join.component";
 export function dialogClose(dialogResult: any) {
 }
 
@@ -40,7 +41,8 @@ export function dialogClose(dialogResult: any) {
     UserActivationComponent,
     NewLandingComponent,
     RoomCreateComponent,
-    HomePageComponent
+    HomePageComponent,
+    RoomJoinComponent
   ],
   entryComponents: [
     RegisterComponent,
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
index 8d6b6c84d5933055dae5bd5467179e098e237431..3c3cc0ac82262fe57b2b4e2a5a075868be0e9e9f 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { NotificationService } from '../../../../services/util/notification.service';
-import { RoomCreateComponent } from '../room-create/room-create.component';
+import { RoomCreateComponent } from '../../../home/_dialogs/room-create/room-create.component';
 import { RoomService } from '../../../../services/http/room.service';
 import { Room } from '../../../../models/room';
 
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
index cd52da6b55c83b3f913907c2a7f75b9b31254972..7cd86b56d6b54a6b8cedb66f8febe4ef8929624c 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Room } from '../../../../models/room';
-import { RoomCreateComponent } from '../room-create/room-create.component';
+import { RoomCreateComponent } from '../../../home/_dialogs/room-create/room-create.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index dafab2dc5774102d634182533f6dd58b3d629796..07cca77e7e030de0cb443a46ef0143b2474ade04 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -9,7 +9,7 @@ import { ContentYesNoCreatorComponent } from './content-yes-no-creator/content-y
 import { HomeCreatorPageComponent } from './home-creator-page/home-creator-page.component';
 import { RoomCreatorPageComponent } from './room-creator-page/room-creator-page.component';
 import { EssentialsModule } from '../essentials/essentials.module';
-import { RoomCreateComponent } from './_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from '../home/_dialogs/room-create/room-create.component';
 import { RoomDeleteComponent } from './_dialogs/room-delete/room-delete.component';
 import { RoomEditComponent } from './_dialogs/room-edit/room-edit.component';
 import { AnswerEditComponent } from './_dialogs/answer-edit/answer-edit.component';
diff --git a/src/app/components/creator/home-creator-page/home-creator-page.component.ts b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
index e406035e50c9d23305e36992785db6e8e9c4e06d..ddd1d8be41516c1ae1c5f61122ac98c5104abc2b 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.ts
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
-import { RoomCreateComponent } from '../_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from '../../home/_dialogs/room-create/room-create.component';
 import { TranslateService } from '@ngx-translate/core';
 import { LanguageService } from '../../../services/util/language.service';
 
diff --git a/src/app/components/home/room-join/room-join.component.ts b/src/app/components/home/room-join/room-join.component.ts
index b639d76c7461f72a9bdec363499ad82a85e39659..259cc449ecfa0b6a0757eb9eb2e4891e534aac53 100644
--- a/src/app/components/home/room-join/room-join.component.ts
+++ b/src/app/components/home/room-join/room-join.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
 import { Router } from '@angular/router';
-import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register.component';
+import { RegisterErrorStateMatcher } from '../_dialogs/register/register.component';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material';
 import { NotificationService } from '../../../services/util/notification.service';
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 2fb1fe98c33730a62bb658be69c7993a893c62b8..a69940b3ba4cb41eb170792cfb292b4ce454eac7 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -7,7 +7,7 @@ import { FooterComponent } from './footer/footer.component';
 import { FooterImprintComponent } from './footer-imprint/footer-imprint.component';
 import { HeaderComponent } from './header/header.component';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { RoomJoinComponent } from './room-join/room-join.component';
+import { RoomJoinComponent } from '../home/room-join/room-join.component';
 import { RoomListComponent } from './room-list/room-list.component';
 import { RoomPageComponent } from './room-page/room-page.component';
 import { StatisticsPageComponent } from './statistics-page/statistics-page.component';