diff --git a/backend/src/entities/content/attachment.entity.ts b/backend/src/entities/content/attachment.entity.ts
index 80104f28..e85e3107 100644
--- a/backend/src/entities/content/attachment.entity.ts
+++ b/backend/src/entities/content/attachment.entity.ts
@@ -9,6 +9,7 @@ export class Attachment {
     @ManyToOne({
         entity: () => LearningObject,
         primary: true,
+        deleteRule: 'cascade'
     })
     learningObject!: LearningObject;
 
diff --git a/backend/src/entities/content/learning-object.entity.ts b/backend/src/entities/content/learning-object.entity.ts
index 59593c9a..335bd2b2 100644
--- a/backend/src/entities/content/learning-object.entity.ts
+++ b/backend/src/entities/content/learning-object.entity.ts
@@ -1,6 +1,5 @@
 import {
     ArrayType,
-    Cascade,
     Collection,
     Embedded,
     Entity,
@@ -93,8 +92,7 @@ export class LearningObject {
 
     @OneToMany({
         entity: () => Attachment,
-        mappedBy: 'learningObject',
-        cascade: [Cascade.ALL]
+        mappedBy: 'learningObject'
     })
     attachments: Collection<Attachment> = new Collection<Attachment>(this);
 
diff --git a/backend/src/services/learning-objects/learning-object-service.ts b/backend/src/services/learning-objects/learning-object-service.ts
index dca719f8..7f547bab 100644
--- a/backend/src/services/learning-objects/learning-object-service.ts
+++ b/backend/src/services/learning-objects/learning-object-service.ts
@@ -72,8 +72,6 @@ const learningObjectService = {
             learningObject.hruid = getEnvVar(envVars.UserContentPrefix) + learningObject.hruid;
         }
 
-        await learningObjectRepository.getEntityManager().flush();
-
         // Lookup the admin teachers based on their usernames and add them to the admins of the learning object.
         const teacherRepo = getTeacherRepository();
         const adminTeachers = await Promise.all(
@@ -85,7 +83,13 @@ const learningObjectService = {
             }
         });
 
-        await learningObjectRepository.save(learningObject, {preventOverwrite: true});
+        try {
+            await learningObjectRepository.save(learningObject, {preventOverwrite: true});
+        } catch (e: unknown) {
+            learningObjectRepository.getEntityManager().clear();
+            throw e;
+        }
+
         return learningObject;
     },
 
diff --git a/frontend/src/components/ButtonWithConfirmation.vue b/frontend/src/components/ButtonWithConfirmation.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index d014cf39..77175d78 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -138,5 +138,6 @@
     "open": "open",
     "editLearningPath": "Edit learning path",
     "newLearningPath": "Create a new learning path",
-    "saveChanges": "Save changes"
+    "saveChanges": "Save changes",
+    "newLearningObject": "Upload learning object"
 }
diff --git a/frontend/src/views/own-learning-content/learning-objects/LearningObjectUploadButton.vue b/frontend/src/views/own-learning-content/learning-objects/LearningObjectUploadButton.vue
index 4507401b..11e145bf 100644
--- a/frontend/src/views/own-learning-content/learning-objects/LearningObjectUploadButton.vue
+++ b/frontend/src/views/own-learning-content/learning-objects/LearningObjectUploadButton.vue
@@ -32,7 +32,13 @@
 <template>
     <v-dialog max-width="500" v-model="dialogOpen">
         <template v-slot:activator="{ props: activatorProps }">
-            <v-fab icon="mdi mdi-plus" v-bind="activatorProps" color="rgb(14, 105, 66)" size="large"></v-fab>
+            <v-btn
+                prepend-icon="mdi mdi-plus"
+                :text="t('newLearningObject')"
+                v-bind="activatorProps"
+                color="rgb(14, 105, 66)"
+                size="large">
+            </v-btn>
         </template>
 
         <template v-slot:default="{ isActive }">
diff --git a/frontend/src/views/own-learning-content/learning-objects/OwnLearningObjectsView.vue b/frontend/src/views/own-learning-content/learning-objects/OwnLearningObjectsView.vue
index 5603e4fb..2429742d 100644
--- a/frontend/src/views/own-learning-content/learning-objects/OwnLearningObjectsView.vue
+++ b/frontend/src/views/own-learning-content/learning-objects/OwnLearningObjectsView.vue
@@ -30,6 +30,7 @@
 <template>
     <div class="root">
         <div class="table-container">
+            <learning-object-upload-button/>
             <v-data-table
                 class="table"
                 v-model="selectedLearningObjects"
@@ -44,17 +45,9 @@
             <learning-object-preview-card class="preview" :selectedLearningObject="selectedLearningObject"/>
         </div>
     </div>
-    <div class="fab">
-        <learning-object-upload-button/>
-    </div>
 </template>
 
 <style scoped>
-    .fab {
-        position: absolute;
-        right: 20px;
-        bottom: 20px;
-    }
     .root {
         display: flex;
         gap: 20px;
@@ -73,5 +66,6 @@
     }
     .table {
         width: 100%;
+        margin-top: 20px;
     }
 </style>