diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
index 2a3db2a5e78f..857ff8a78e4a 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
@@ -1,92 +1,82 @@
-@if (isLoading) {
-    <div class="d-flex justify-content-center">
-        <div class="spinner-border" role="status">
-            <span class="sr-only" jhiTranslate="loading"></span>
+<div class="container">
+    <div class="row">
+        <div class="col-12 mx-auto">
+            <h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
         </div>
     </div>
-} @else {
-    <div class="container">
-        <div class="row">
-            <div class="col-12 mx-auto">
-                <h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
-            </div>
+    <div class="row">
+        <div class="col-sm-6 mx-auto">
+            <p jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.description"></p>
         </div>
-        <div class="row">
-            <div class="col-sm-6 mx-auto">
-                <p jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.description"></p>
-            </div>
-            <div class="col-sm-6 mx-auto text-end">
-                @if (hasCancelButton()) {
-                    <button type="button" (click)="cancelForm()" class="btn btn-default">
-                        <fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
-                    </button>
-                }
-                <button
-                    id="createButton"
-                    type="button"
-                    class="btn btn-primary"
-                    [disabled]="exercisesToCreateUnitFor.length === 0"
-                    (click)="createExerciseUnits()"
-                    jhiTranslate="entity.action.submit"
-                ></button>
-            </div>
+        <div class="col-sm-6 mx-auto text-end">
+            @if (hasCancelButton()) {
+                <button type="button" (click)="cancelForm()" class="btn btn-default"><fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
+            }
+            <button
+                id="createButton"
+                type="button"
+                class="btn btn-primary"
+                [disabled]="exercisesToCreateUnitFor.length === 0"
+                (click)="createExerciseUnits()"
+                jhiTranslate="entity.action.submit"
+            ></button>
         </div>
-        <div class="row">
-            <div class="col-12 mx-auto">
-                <div class="table-responsive">
-                    <table class="table table-bordered">
-                        <thead class="thead-dark">
-                            <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" (sortChange)="sortRows()">
-                                <th jhiSortBy="id">
-                                    id
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="type">
-                                    {{ 'artemisApp.exercise.type' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="title">
-                                    {{ 'artemisApp.exercise.title' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="shortName">
-                                    {{ 'artemisApp.exercise.shortName' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="releaseDate">
-                                    {{ 'artemisApp.exercise.releaseDate' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="dueDate">
-                                    {{ 'artemisApp.exercise.dueDate' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
-                                <th jhiSortBy="assessmentDueDate">
-                                    {{ 'artemisApp.exercise.assessmentDueDate' | artemisTranslate }}
-                                    <fa-icon [icon]="faSort" />
-                                </th>
+    </div>
+    <div class="row">
+        <div class="col-12 mx-auto">
+            <div class="table-responsive">
+                <table class="table table-bordered">
+                    <thead class="thead-dark">
+                        <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" (sortChange)="sortRows()">
+                            <th jhiSortBy="id">
+                                id
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="type">
+                                {{ 'artemisApp.exercise.type' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="title">
+                                {{ 'artemisApp.exercise.title' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="shortName">
+                                {{ 'artemisApp.exercise.shortName' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="releaseDate">
+                                {{ 'artemisApp.exercise.releaseDate' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="dueDate">
+                                {{ 'artemisApp.exercise.dueDate' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                            <th jhiSortBy="assessmentDueDate">
+                                {{ 'artemisApp.exercise.assessmentDueDate' | artemisTranslate }}
+                                <fa-icon [icon]="faSort" />
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @for (exercise of exercisesAvailableForUnitCreation; track exercise) {
+                            <tr
+                                (click)="selectExerciseForUnitCreation(exercise)"
+                                [class.table-primary]="isExerciseSelectedForUnitCreation(exercise)"
+                                id="exercise-{{ exercise.id }}"
+                            >
+                                <td>{{ exercise.id ? exercise.id : '' }}</td>
+                                <td>{{ exercise.type ? exercise.type : '' }}</td>
+                                <td>{{ exercise.title ? exercise.title : '' }}</td>
+                                <td>{{ exercise.shortName ? exercise.shortName : '' }}</td>
+                                <td>{{ exercise.releaseDate ? exercise.releaseDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
+                                <td>{{ exercise.dueDate ? exercise.dueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
+                                <td>{{ exercise.assessmentDueDate ? exercise.assessmentDueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
                             </tr>
-                        </thead>
-                        <tbody>
-                            @for (exercise of exercisesAvailableForUnitCreation; track exercise) {
-                                <tr
-                                    (click)="selectExerciseForUnitCreation(exercise)"
-                                    [class.table-primary]="isExerciseSelectedForUnitCreation(exercise)"
-                                    id="exercise-{{ exercise.id }}"
-                                >
-                                    <td>{{ exercise.id ? exercise.id : '' }}</td>
-                                    <td>{{ exercise.type ? exercise.type : '' }}</td>
-                                    <td>{{ exercise.title ? exercise.title : '' }}</td>
-                                    <td>{{ exercise.shortName ? exercise.shortName : '' }}</td>
-                                    <td>{{ exercise.releaseDate ? exercise.releaseDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
-                                    <td>{{ exercise.dueDate ? exercise.dueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
-                                    <td>{{ exercise.assessmentDueDate ? exercise.assessmentDueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
+                        }
+                    </tbody>
+                </table>
             </div>
         </div>
     </div>
-}
+</div>
diff --git a/src/main/webapp/app/lecture/lecture-units/lecture-units.component.html b/src/main/webapp/app/lecture/lecture-units/lecture-units.component.html
index 97c984fe428d..62fee8bb5fea 100644
--- a/src/main/webapp/app/lecture/lecture-units/lecture-units.component.html
+++ b/src/main/webapp/app/lecture/lecture-units/lecture-units.component.html
@@ -8,63 +8,60 @@ <h3><span jhiTranslate="artemisApp.lecture.sections.units"></span></h3>
         [showCreationCard]="false"
         [showCompetencies]="false"
     />
-    @if (!isAnyUnitFormOpen()) {
-        <div class="form-group w-100 d-flex justify-content-start">
-            <jhi-unit-creation-card [emitEvents]="true" (onUnitCreationCardClicked)="onCreateLectureUnit($event)" />
-        </div>
-    } @else {
-        <div class="form-group">
-            @if (!isEditingLectureUnit) {
-                <h4><span jhiTranslate="artemisApp.lecture.newLectureUnit"></span></h4>
-            } @else {
-                <h4><span jhiTranslate="artemisApp.lecture.editLectureUnit"></span></h4>
-            }
-            @if (isTextUnitFormOpen()) {
-                <jhi-text-unit-form
-                    [isEditMode]="isEditingLectureUnit"
-                    [hasCancelButton]="true"
-                    (onCancel)="onCloseLectureUnitForms()"
-                    (formSubmitted)="createEditTextUnit($event)"
-                    [formData]="textUnitFormData"
-                />
-            }
-            @if (isVideoUnitFormOpen()) {
-                <jhi-video-unit-form
-                    [isEditMode]="isEditingLectureUnit"
-                    [hasCancelButton]="true"
-                    (onCancel)="onCloseLectureUnitForms()"
-                    (formSubmitted)="createEditVideoUnit($event)"
-                    [formData]="videoUnitFormData"
-                />
-            }
-            @if (isOnlineUnitFormOpen()) {
-                <jhi-online-unit-form
-                    [isEditMode]="isEditingLectureUnit"
-                    [hasCancelButton]="true"
-                    (onCancel)="onCloseLectureUnitForms()"
-                    (formSubmitted)="createEditOnlineUnit($event)"
-                    [formData]="onlineUnitFormData"
-                />
-            }
-            @if (isAttachmentUnitFormOpen()) {
-                <jhi-attachment-unit-form
-                    [isEditMode]="isEditingLectureUnit"
-                    [hasCancelButton]="true"
-                    (onCancel)="onCloseLectureUnitForms()"
-                    (formSubmitted)="createEditAttachmentUnit($event)"
-                    [formData]="attachmentUnitFormData"
-                />
-            }
-            @if (isExerciseUnitFormOpen()) {
-                <jhi-create-exercise-unit
-                    [shouldNavigateOnSubmit]="false"
-                    (onExerciseUnitCreated)="onExerciseUnitCreated()"
-                    [lectureId]="lecture.id"
-                    [courseId]="lecture.course?.id"
-                    [hasCancelButton]="true"
-                    (onCancel)="onCloseLectureUnitForms()"
-                />
-            }
-        </div>
-    }
+    <div class="form-group w-100 d-flex justify-content-start">
+        <jhi-unit-creation-card [emitEvents]="true" (onUnitCreationCardClicked)="onCreateLectureUnit($event)" />
+    </div>
+    <div class="form-group">
+        @if (isEditingLectureUnit) {
+            <h4><span jhiTranslate="artemisApp.lecture.editLectureUnit"></span></h4>
+        } @else if (isAnyUnitFormOpen()) {
+            <h4><span jhiTranslate="artemisApp.lecture.newLectureUnit"></span></h4>
+        }
+        @if (isTextUnitFormOpen()) {
+            <jhi-text-unit-form
+                [isEditMode]="isEditingLectureUnit"
+                [hasCancelButton]="true"
+                (onCancel)="onCloseLectureUnitForms()"
+                (formSubmitted)="createEditTextUnit($event)"
+                [formData]="textUnitFormData"
+            />
+        }
+        @if (isVideoUnitFormOpen()) {
+            <jhi-video-unit-form
+                [isEditMode]="isEditingLectureUnit"
+                [hasCancelButton]="true"
+                (onCancel)="onCloseLectureUnitForms()"
+                (formSubmitted)="createEditVideoUnit($event)"
+                [formData]="videoUnitFormData"
+            />
+        }
+        @if (isOnlineUnitFormOpen()) {
+            <jhi-online-unit-form
+                [isEditMode]="isEditingLectureUnit"
+                [hasCancelButton]="true"
+                (onCancel)="onCloseLectureUnitForms()"
+                (formSubmitted)="createEditOnlineUnit($event)"
+                [formData]="onlineUnitFormData"
+            />
+        }
+        @if (isAttachmentUnitFormOpen()) {
+            <jhi-attachment-unit-form
+                [isEditMode]="isEditingLectureUnit"
+                [hasCancelButton]="true"
+                (onCancel)="onCloseLectureUnitForms()"
+                (formSubmitted)="createEditAttachmentUnit($event)"
+                [formData]="attachmentUnitFormData"
+            />
+        }
+        @if (isExerciseUnitFormOpen()) {
+            <jhi-create-exercise-unit
+                [shouldNavigateOnSubmit]="false"
+                (onExerciseUnitCreated)="onExerciseUnitCreated()"
+                [lectureId]="lecture.id"
+                [courseId]="lecture.course?.id"
+                [hasCancelButton]="true"
+                (onCancel)="onCloseLectureUnitForms()"
+            />
+        }
+    </div>
 </div>
diff --git a/src/main/webapp/app/lecture/lecture-units/lecture-units.component.ts b/src/main/webapp/app/lecture/lecture-units/lecture-units.component.ts
index 6bce60f7cc38..61c5f8f8a10b 100644
--- a/src/main/webapp/app/lecture/lecture-units/lecture-units.component.ts
+++ b/src/main/webapp/app/lecture/lecture-units/lecture-units.component.ts
@@ -91,7 +91,7 @@ export class LectureUpdateUnitsComponent implements OnInit {
 
     onCreateLectureUnit(type: LectureUnitType) {
         this.isEditingLectureUnit = false;
-
+        this.onCloseLectureUnitForms();
         switch (type) {
             case LectureUnitType.TEXT:
                 this.isTextUnitFormOpen.set(true);