diff --git a/src/locales/de.ts b/src/locales/de.ts
index 4ecbe3e063..40f5bb4625 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -543,8 +543,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Hier ist ein Bild mit folgendem Namen",
 	"components.cardElement.fileElement.pdfAlt": "Vorschaubild für ",
 	"components.cardElement.fileElement.collaboraFile": "Dokument",
-	"components.cardElement.fileElement.collaboraFile.types": "Dokumententyp",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Unbenanntes Dokument",
 	"components.cardElement.fileElement.previewError": "Laden der Vorschau fehlgeschlagen.",
 	"components.cardElement.fileElement.reloadStatus": "Status aktualisieren",
 	"components.cardElement.fileElement.videoFormatError":
@@ -596,9 +594,6 @@ export default {
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videokonferenz",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interaktives Lernelement",
 	"components.elementTypeSelection.elements.collabora.subtitle": "Dokument erstellen",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Text)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Tabelle)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Präsentation)",
 	"components.externalTools.status.deactivated": "Deaktiviert",
 	"components.externalTools.status.incomplete": "Unvollständig",
 	"components.externalTools.status.latest": "Aktuell",
@@ -2034,6 +2029,12 @@ export default {
 	"feature.media-shelf.layout.list": "Zeilen",
 	"feature.media-shelf.layout.grid": "Raster",
 	"feature.collabora.iframeTitle": "Office-Dokument Editor",
+	"feature.collabora.add-collabora-file-dialog.title": "Dokument erstellen",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Dokumententyp",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Tabelle)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Präsentation)",
 	"pages.folder.emptyState": "Aktuell gibt es hier noch keine Dateien",
 	"pages.folder.fab.title": "Datei hinzufügen",
 	"pages.folder.untitled": "Unbenannter Ordner",
@@ -2054,10 +2055,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Der Dateiname enthält ungültige Zeichen.",
 	"pages.folder.fab.upload-file": "Datei hochladen",
 	"pages.folder.fab.create-document": "Dokument erstellen",
-	"pages.folder.add-collabora-file-dialog.title": "Dokument erstellen",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Dokumententyp",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Unbenanntes Dokument",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Tabelle)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Präsentation)",
 };
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 426c79a442..f15250eb5f 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -528,8 +528,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Here is an image with the following name",
 	"components.cardElement.fileElement.pdfAlt": "Preview image for ",
 	"components.cardElement.fileElement.collaboraFile": "Document",
-	"components.cardElement.fileElement.collaboraFile.types": "Document type",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Untitled document",
 	"components.cardElement.fileElement.previewError": "Failed to load the preview.",
 	"components.cardElement.fileElement.reloadStatus": "Update status",
 	"components.cardElement.fileElement.videoFormatError":
@@ -582,9 +580,6 @@ export default {
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Video conference",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Interactive learning element",
 	"components.elementTypeSelection.elements.collabora.subtitle": "Create document",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (text)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (spreadsheet)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (presentation)",
 	"components.externalTools.status.deactivated": "Deactivated",
 	"components.externalTools.status.incomplete": "Configuration incomplete",
 	"components.externalTools.status.latest": "Latest",
@@ -1998,6 +1993,12 @@ export default {
 	"feature.media-shelf.layout.list": "Lines",
 	"feature.media-shelf.layout.grid": "Grid",
 	"feature.collabora.iframeTitle": "Office document editor",
+	"feature.collabora.add-collabora-file-dialog.title": "Create document",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Document type",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Untitled document",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Text)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Spreadsheet)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Presentation)",
 	"pages.folder.emptyState": "There are currently no files here",
 	"pages.folder.fab.title": "Add file",
 	"pages.folder.untitled": "Untitled folder",
@@ -2018,10 +2019,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "The file name contains invalid characters.",
 	"pages.folder.fab.upload-file": "Upload file",
 	"pages.folder.fab.create-document": "Create document",
-	"pages.folder.add-collabora-file-dialog.title": "Create document",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Document type",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Untitled document",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Text)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Spreadsheet)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentation)",
 };
diff --git a/src/locales/es.ts b/src/locales/es.ts
index a1487a47e4..5f8c28de9a 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -538,8 +538,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Aquí tenéis una imagen con el siguiente nombre",
 	"components.cardElement.fileElement.pdfAlt": "Imagen de vista previa para ",
 	"components.cardElement.fileElement.collaboraFile": "Archivo",
-	"components.cardElement.fileElement.collaboraFile.types": "Tipo de documento",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Documento sin título",
 	"components.cardElement.fileElement.previewError": "No se ha podido cargar la vista previa.",
 	"components.cardElement.fileElement.reloadStatus": "Estado de actualización",
 	"components.cardElement.fileElement.videoFormatError":
@@ -592,9 +590,6 @@ export default {
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Videoconferencia",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Elemento de aprendizaje interactivo",
 	"components.elementTypeSelection.elements.collabora.subtitle": "Crear documento",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Texto)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Hoja de cálculo)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Presentación)",
 	"components.externalTools.status.deactivated": "Desactivado",
 	"components.externalTools.status.incomplete": "Configuración incompleta",
 	"components.externalTools.status.latest": "Actual",
@@ -2049,6 +2044,12 @@ export default {
 	"feature.media-shelf.layout.list": "Líneas",
 	"feature.media-shelf.layout.grid": "Red",
 	"feature.collabora.iframeTitle": "Editor de documentos de Office",
+	"feature.collabora.add-collabora-file-dialog.title": "Crear documento",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Tipo de documento",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Documento sin título",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Texto)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Hoja de cálculo)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Presentación)",
 	"pages.folder.emptyState": "Actualmente no hay archivos aquí",
 	"pages.folder.fab.title": "Añadir archivo",
 	"pages.folder.untitled": "Carpeta sin título",
@@ -2070,10 +2071,4 @@ export default {
 		"El nombre del archivo contiene caracteres no válidos.",
 	"pages.folder.fab.upload-file": "Subir archivo",
 	"pages.folder.fab.create-document": "Crear documento",
-	"pages.folder.add-collabora-file-dialog.title": "Crear documento",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Tipo de documento",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Documento sin título",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Texto)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Hoja de cálculo)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Presentación)",
 };
diff --git a/src/locales/uk.ts b/src/locales/uk.ts
index e4fe05ee55..340fb6ad54 100644
--- a/src/locales/uk.ts
+++ b/src/locales/uk.ts
@@ -537,8 +537,6 @@ export default {
 	"components.cardElement.fileElement.emptyAlt": "Ось зображення з такою назвою",
 	"components.cardElement.fileElement.pdfAlt": "попередній перегляд зображення для ",
 	"components.cardElement.fileElement.collaboraFile": "Документ",
-	"components.cardElement.fileElement.collaboraFile.types": "Тип документа",
-	"components.cardElement.fileElement.collaboraFile.untitled": "Без назви документ",
 	"components.cardElement.fileElement.previewError": "Не вдалося завантажити попередній перегляд.",
 	"components.cardElement.fileElement.reloadStatus": "Статус оновлення",
 	"components.cardElement.fileElement.videoFormatError":
@@ -591,9 +589,6 @@ export default {
 	"components.elementTypeSelection.elements.videoConferenceElement.subtitle": "Відеоконференція",
 	"components.elementTypeSelection.elements.h5pElement.subtitle": "Інтерактивний елемент навчання",
 	"components.elementTypeSelection.elements.collabora.subtitle": "Створити документ",
-	"components.elementTypeSelection.elements.collabora.option.text": ".docx (Документ)",
-	"components.elementTypeSelection.elements.collabora.option.spreadsheet": ".xlsx (Таблиця)",
-	"components.elementTypeSelection.elements.collabora.option.presentation": ".pptx (Презентація)",
 	"components.externalTools.status.deactivated": "Деактивовано",
 	"components.externalTools.status.incomplete": "Конфігурація не завершена",
 	"components.externalTools.status.latest": "Останній",
@@ -2018,6 +2013,12 @@ export default {
 	"feature.media-shelf.layout.list": "лінії",
 	"feature.media-shelf.layout.grid": "сітка",
 	"feature.collabora.iframeTitle": "Редактор документів Office",
+	"feature.collabora.add-collabora-file-dialog.title": "Створити документ",
+	"feature.collabora.add-collabora-file-dialog.doc-types": "Тип документа",
+	"feature.collabora.add-collabora-file-dialog.untitled-file": "Без назви документ",
+	"feature.collabora.add-collabora-file-dialog.option.text": ".docx (Документ)",
+	"feature.collabora.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Таблиця)",
+	"feature.collabora.add-collabora-file-dialog.option.presentation": ".pptx (Презентація)",
 	"pages.folder.emptyState": "Наразі тут немає файлів",
 	"pages.folder.fab.title": "Додати файл",
 	"pages.folder.untitled": "Папка без назви",
@@ -2038,10 +2039,4 @@ export default {
 	"pages.folder.rename-file-dialog.validation.invalid-characters": "Ім'я файлу містить недопустимі символи.",
 	"pages.folder.fab.upload-file": "Завантажити файл",
 	"pages.folder.fab.create-document": "Створити документ",
-	"pages.folder.add-collabora-file-dialog.title": "Створити документ",
-	"pages.folder.add-collabora-file-dialog.doc-types": "Тип документа",
-	"pages.folder.add-collabora-file-dialog.untitled-file": "Без назви документ",
-	"pages.folder.add-collabora-file-dialog.option.text": ".docx (Документ)",
-	"pages.folder.add-collabora-file-dialog.option.spreadsheet": ".xlsx (Таблиця)",
-	"pages.folder.add-collabora-file-dialog.option.presentation": ".pptx (Презентація)",
 };
diff --git a/src/modules/data/board/Card.store.ts b/src/modules/data/board/Card.store.ts
index a0cb9bbdbb..adaaa51545 100644
--- a/src/modules/data/board/Card.store.ts
+++ b/src/modules/data/board/Card.store.ts
@@ -15,8 +15,10 @@ import {
 import { useCardRestApi } from "./cardActions/cardRestApi.composable";
 import { useCardSocketApi } from "./cardActions/cardSocketApi.composable";
 import { CardResponse, ContentElementType, PreferredToolResponse, ToolContextType } from "@/serverApi/v3";
+import { FileRecordParent } from "@/types/file/File";
 import { notifyInfo } from "@data-app";
 import { useEnvConfig } from "@data-env";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
 import { defineStore } from "pinia";
 import { nextTick, Ref, ref } from "vue";
@@ -35,6 +37,7 @@ export const useCardStore = defineStore("cardStore", () => {
 
 	const { setFocus, forceFocus } = useBoardFocusHandler();
 	const { setEditModeId, editModeId } = useSharedEditMode();
+	const { uploadCollaboraFile } = useFileStorageApi();
 
 	const fetchCardRequest = socketOrRest.fetchCardRequest;
 
@@ -109,6 +112,25 @@ export const useCardStore = defineStore("cardStore", () => {
 
 	const createElementRequest = socketOrRest.createElementRequest;
 
+	const createFileElementWithCollabora = async (type: CollaboraFileType, fileName: string) => {
+		if (!editModeId.value) {
+			return;
+		}
+
+		const element = await createElementRequest({
+			type: ContentElementType.File,
+			cardId: editModeId.value,
+		});
+		if (!element) {
+			return;
+		}
+
+		const uploadedCollaboraFile = await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
+		if (!uploadedCollaboraFile) {
+			await deleteElementRequest({ elementId: element.id, cardId: editModeId.value });
+		}
+	};
+
 	const createPreferredElement = (payload: CreateElementRequestPayload, tool: PreferredToolResponse) => {
 		restApi.createPreferredElement(payload, tool);
 	};
@@ -265,5 +287,6 @@ export const useCardStore = defineStore("cardStore", () => {
 		preferredTools,
 		isPreferredToolsLoading,
 		disconnectSocketRequest,
+		createFileElementWithCollabora,
 	};
 });
diff --git a/src/modules/data/board/Card.store.unit.ts b/src/modules/data/board/Card.store.unit.ts
index 731902fb9e..b086a2f277 100644
--- a/src/modules/data/board/Card.store.unit.ts
+++ b/src/modules/data/board/Card.store.unit.ts
@@ -19,6 +19,7 @@ import { cardResponseFactory } from "@@/tests/test-utils/factory/cardResponseFac
 import { drawingElementResponseFactory } from "@@/tests/test-utils/factory/drawingElementResponseFactory";
 import { useNotificationStore } from "@data-app";
 import { CreateElementRequestPayload, useCardStore, useSocketConnection } from "@data-board";
+import { CollaboraFileType, useFileStorageApi } from "@data-file";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedEditMode, useSharedLastCreatedElement } from "@util-board";
@@ -49,6 +50,9 @@ const mockedUseSocketConnection = vi.mocked(useSocketConnection);
 vi.mock("./BoardFocusHandler.composable");
 const mockedBoardFocusHandler = vi.mocked(useBoardFocusHandler);
 
+vi.mock("@data-file");
+const mockedFileStorageApi = vi.mocked(useFileStorageApi);
+
 describe("CardStore", () => {
 	let mockedBoardApiCalls: DeepMocked<ReturnType<typeof useBoardApi>>;
 	let mockedErrorHandlerCalls: DeepMocked<ReturnType<typeof useErrorHandler>>;
@@ -59,6 +63,7 @@ describe("CardStore", () => {
 	let setEditModeId: Mock;
 	let editModeId: Ref<string | undefined>;
 	let mockedBoardFocusCalls: DeepMocked<ReturnType<typeof useBoardFocusHandler>>;
+	let mockedFileStorageActions: DeepMocked<ReturnType<typeof useFileStorageApi>>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
@@ -110,6 +115,11 @@ describe("CardStore", () => {
 		mockedBoardFocusCalls = createMock<ReturnType<typeof useBoardFocusHandler>>();
 		mockedBoardFocusHandler.mockReturnValue(mockedBoardFocusCalls);
 
+		mockedFileStorageActions = createMock<ReturnType<typeof useFileStorageApi>>({
+			uploadCollaboraFile: vi.fn(),
+		});
+		mockedFileStorageApi.mockReturnValue(mockedFileStorageActions);
+
 		setEditModeId = vi.fn();
 		editModeId = ref(undefined);
 		mockedSharedEditMode.mockReturnValue({
@@ -970,4 +980,86 @@ describe("CardStore", () => {
 			});
 		});
 	});
+
+	describe("createFileElementWithCollabora", () => {
+		const setupCreateFileElementWithCollabora = (editMode = false, createElementFails = false, uploadFails = false) => {
+			const { cardStore } = setup(false);
+
+			editModeId.value = editMode ? "cardId" : undefined;
+
+			const createElementRequestReturnValue = createElementFails
+				? Promise.resolve(undefined)
+				: Promise.resolve({
+						id: "elementId",
+						type: ContentElementType.File,
+						content: {},
+					});
+			mockedCardRestApiActions.createElementRequest.mockReturnValue(createElementRequestReturnValue);
+
+			const uploadCollaboraFileReturnValue = uploadFails
+				? Promise.resolve(undefined)
+				: Promise.resolve({ id: "fileId" });
+			mockedFileStorageActions.uploadCollaboraFile.mockReturnValue(uploadCollaboraFileReturnValue);
+
+			return {
+				cardStore,
+			};
+		};
+
+		describe("when a card is in edit mode", () => {
+			it("should call createElementRequest", () => {
+				const { cardStore } = setupCreateFileElementWithCollabora(true, false, false);
+
+				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedCardRestApiActions.createElementRequest).toHaveBeenCalled();
+			});
+
+			it("should call uploadCollaboraFile", async () => {
+				const { cardStore } = setupCreateFileElementWithCollabora(true, false, false);
+
+				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedFileStorageActions.uploadCollaboraFile).toHaveBeenCalled();
+			});
+
+			describe("when element creation fails", () => {
+				it("should not call uploadCollaboraFile", async () => {
+					const { cardStore } = setupCreateFileElementWithCollabora(true, true, false);
+
+					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+					expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();
+				});
+			});
+
+			describe("when uploading collabora file fails", () => {
+				it("should delete created element", async () => {
+					const { cardStore } = setupCreateFileElementWithCollabora(true, false, true);
+
+					await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+					expect(mockedCardRestApiActions.deleteElementRequest).toHaveBeenCalled();
+				});
+			});
+		});
+
+		describe("when no card is in edit mode", () => {
+			it("should not call createElementRequest", () => {
+				const { cardStore } = setupCreateFileElementWithCollabora(false, false, false);
+
+				cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedCardRestApiActions.createElementRequest).not.toHaveBeenCalled();
+			});
+
+			it("should not call uploadCollaboraFile", async () => {
+				const { cardStore } = setupCreateFileElementWithCollabora(false, false, false);
+
+				await cardStore.createFileElementWithCollabora(CollaboraFileType.Text, "fileName.docx");
+
+				expect(mockedFileStorageActions.uploadCollaboraFile).not.toHaveBeenCalled();
+			});
+		});
+	});
 });
diff --git a/src/modules/data/file/FileStorageApi.composable.ts b/src/modules/data/file/FileStorageApi.composable.ts
index cc6315a81f..cb3031d1a4 100644
--- a/src/modules/data/file/FileStorageApi.composable.ts
+++ b/src/modules/data/file/FileStorageApi.composable.ts
@@ -27,9 +27,9 @@ export enum ErrorType {
 }
 
 export enum CollaboraFileType {
-	Text,
-	Spreadsheet,
-	Presentation,
+	Text = "TEXT",
+	Spreadsheet = "SPREADSHEET",
+	Presentation = "PRESENTATION",
 }
 
 export const useFileStorageApi = () => {
diff --git a/src/modules/feature/board/board/Board.unit.ts b/src/modules/feature/board/board/Board.unit.ts
index 186426247c..92a565c294 100644
--- a/src/modules/feature/board/board/Board.unit.ts
+++ b/src/modules/feature/board/board/Board.unit.ts
@@ -38,6 +38,8 @@ import {
 	useCardStore,
 	useSharedBoardPageInformation,
 } from "@data-board";
+import { CollaboraFileType } from "@data-file";
+import { AddCollaboraFileDialog } from "@feature-collabora";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import { SelectBoardLayoutDialog } from "@ui-room-details";
@@ -1067,6 +1069,20 @@ describe("Board", () => {
 				);
 			});
 		});
+
+		describe("@onCreateCollaboraFile", () => {
+			it("should call createFileElementWithCollabora method", async () => {
+				const { wrapper, cardStore } = setup();
+
+				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
+
+				expect(cardStore.createFileElementWithCollabora).toHaveBeenCalled();
+			});
+		});
 	});
 
 	describe("Change board layout", () => {
diff --git a/src/modules/feature/board/board/Board.vue b/src/modules/feature/board/board/Board.vue
index b3c36e5359..834d965665 100644
--- a/src/modules/feature/board/board/Board.vue
+++ b/src/modules/feature/board/board/Board.vue
@@ -88,7 +88,7 @@
 				</div>
 				<ConfirmationDialog />
 				<AddElementDialog />
-				<AddCollaboraFileDialog />
+				<AddCollaboraFileDialog @create-collabora-file="onCreateCollaboraFile" />
 				<LightBox />
 				<MoveCardDialog
 					v-if="roomId"
@@ -122,7 +122,6 @@
 </template>
 
 <script setup lang="ts">
-import AddCollaboraFileDialog from "../shared/AddCollaboraFileDialog.vue";
 import AddElementDialog from "../shared/AddElementDialog.vue";
 import { useBodyScrolling } from "../shared/BodyScrolling.composable";
 import EditSettingsDialog from "../shared/EditSettingsDialog.vue";
@@ -153,6 +152,8 @@ import { COPY_MODULE_KEY, injectStrict, SHARE_MODULE_KEY } from "@/utils/inject"
 import { useAppStore, useNotificationStore } from "@data-app";
 import { useBoardInactivity, useBoardPermissions, useCardStore, useSharedBoardPageInformation } from "@data-board";
 import { useEnvConfig } from "@data-env";
+import type { CreateCollaboraFilePayload } from "@feature-collabora";
+import { AddCollaboraFileDialog } from "@feature-collabora";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
 import { SelectBoardLayoutDialog } from "@ui-room-details";
@@ -482,6 +483,10 @@ const onSaveEditBoardSettings = async (isEditableForEveryone: boolean) => {
 
 	isEditSettingsDialogOpen.value = false;
 };
+
+const onCreateCollaboraFile = async (payload: CreateCollaboraFilePayload) => {
+	cardStore.createFileElementWithCollabora(payload.type, payload.fileName);
+};
 </script>
 
 <style scoped>
diff --git a/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts b/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts
deleted file mode 100644
index 9f52923ddf..0000000000
--- a/src/modules/feature/board/shared/AddCollaboraFileDialog.unit.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-import { setupCollaboraFileSelectionMock } from "../test-utils/add-collabora-file-mock";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
-import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
-import { Dialog } from "@ui-dialog";
-import { flushPromises, mount } from "@vue/test-utils";
-import { nextTick } from "vue";
-import { VForm, VSelect } from "vuetify/lib/components/index";
-
-vi.mock("./add-collabora-file.composable");
-
-describe("CollaboraFileDialog", () => {
-	const setupMocks = () => {
-		const { closeCollaboraFileDialog, isCollaboraFileDialogOpen, collaboraFileSelectionOptions } =
-			setupCollaboraFileSelectionMock();
-
-		return {
-			isCollaboraFileDialogOpen,
-			closeCollaboraFileDialog,
-			collaboraFileSelectionOptions,
-		};
-	};
-
-	describe("when isCollaboraFileDialogOpen is false", () => {
-		const setup = () => {
-			document.body.setAttribute("data-app", "true");
-
-			setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-			});
-
-			return { wrapper };
-		};
-
-		it("should be found in dom", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.exists()).toBe(true);
-		});
-
-		it("the modal should not be visible", () => {
-			const { wrapper } = setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(false);
-		});
-	});
-
-	describe("when isCollaboraFileDialogOpen is changed from false to true", () => {
-		const setup = async () => {
-			document.body.setAttribute("data-app", "true");
-
-			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = setupMocks();
-
-			const wrapper = mount(AddCollaboraFileDialog, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					stubs: { UseFocusTrap: true },
-				},
-				attachTo: document.body,
-			});
-
-			isCollaboraFileDialogOpen.value = true;
-			await nextTick();
-
-			return { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions, wrapper };
-		};
-
-		it("should make modal visible", async () => {
-			const { wrapper } = await setup();
-
-			expect(wrapper.findComponent(VForm).exists()).toBe(true);
-			expect(wrapper.findComponent(VForm).isVisible()).toBe(true);
-		});
-
-		it("should have confirm button disabled initially", async () => {
-			const { wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			expect(dialog.props("confirmBtnDisabled")).toBe(true);
-		});
-
-		it("should render options", async () => {
-			const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-			const typeSelect = wrapper.findComponent(VSelect);
-			expect(typeSelect.props("items")).toBe(collaboraFileSelectionOptions);
-		});
-
-		describe("when form is valid", () => {
-			it("should call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalled();
-				expect(selectOption.action).toHaveBeenCalledWith(FILENAME, "");
-			});
-
-			it("should have confirm button enabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-				const FILENAME = "myDocument";
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue(FILENAME);
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(false);
-			});
-		});
-
-		describe("when filetype is not selected", () => {
-			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("myDocument");
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { wrapper } = await setup();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("myDocument");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename is empty", () => {
-			it("should not call item action", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-				expect(typeSelect.find("input").element.value).toBe(selectOption.id);
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']").find("input");
-				expect(fileNameInput.element.value).toBe("");
-
-				const form = wrapper.findComponent("[data-testid='collabora-element-form']");
-				await form.trigger("submit");
-				await nextTick();
-				await flushPromises();
-				expect(selectOption.action).toHaveBeenCalledTimes(0);
-			});
-
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when filename contains invalid characters", () => {
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("invalid/filename");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		describe("when caption contains opening tag", () => {
-			it("should have confirm button disabled", async () => {
-				const { collaboraFileSelectionOptions, wrapper } = await setup();
-
-				const selectOption = collaboraFileSelectionOptions[0];
-
-				const typeSelect = wrapper.findComponent(VSelect);
-				typeSelect.vm.$emit("update:modelValue", selectOption.id);
-				await nextTick();
-
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-element-form-filename']");
-				await fileNameInput.find("input").setValue("validFilename");
-				await nextTick();
-
-				const captionInput = wrapper.findComponent("[data-testid='collabora-element-form-caption']");
-				await captionInput.find("textarea").setValue("<script>alert('xss')</script>");
-				await nextTick();
-
-				const dialog = wrapper.findComponent(Dialog);
-				expect(dialog.props("confirmBtnDisabled")).toBe(true);
-			});
-		});
-
-		it("should close modal on close button click", async () => {
-			const { closeCollaboraFileDialog, wrapper } = await setup();
-
-			const dialog = wrapper.findComponent(Dialog);
-			dialog.vm.$emit("cancel");
-
-			await nextTick();
-
-			expect(closeCollaboraFileDialog).toHaveBeenCalled();
-		});
-	});
-});
diff --git a/src/modules/feature/board/shared/AddElementDialog.composable.ts b/src/modules/feature/board/shared/AddElementDialog.composable.ts
index 0ae720b948..f4024c09dc 100644
--- a/src/modules/feature/board/shared/AddElementDialog.composable.ts
+++ b/src/modules/feature/board/shared/AddElementDialog.composable.ts
@@ -1,10 +1,10 @@
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
 import { ElementTypeSelectionOptions, useSharedElementTypeSelection } from "./SharedElementTypeSelection.composable";
 import { BoardFeature, ContentElementType, PreferredToolResponse } from "@/serverApi/v3";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { notifyInfo } from "@data-app";
 import { type CreateElementRequestPayload, useBoardFeatures, useBoardPermissions, useCardStore } from "@data-board";
 import { useEnvConfig } from "@data-env";
+import { useAddCollaboraFile } from "@feature-collabora";
 import {
 	mdiFileDocumentOutline,
 	mdiFolderOpenOutline,
@@ -35,8 +35,7 @@ export const useAddElementDialog = (createElementRequestFn: CreateElementRequest
 	const { isDialogOpen, isDialogLoading, closeDialog, staticElementTypeOptions, dynamicElementTypeOptions } =
 		useSharedElementTypeSelection();
 
-	const { openCollaboraFileDialog, setCardId, setCreateElementRequestFn } = useAddCollaboraFile();
-	setCreateElementRequestFn(createElementRequestFn);
+	const { openCollaboraFileDialog } = useAddCollaboraFile();
 
 	const onElementClick = async (elementType: ContentElementType) => {
 		closeDialog();
@@ -53,7 +52,6 @@ export const useAddElementDialog = (createElementRequestFn: CreateElementRequest
 	};
 
 	const onOfficeFileClick = async () => {
-		setCardId(cardId);
 		closeDialog();
 		openCollaboraFileDialog();
 	};
diff --git a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
index 9fc40a52b1..1fe66f2ba3 100644
--- a/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
+++ b/src/modules/feature/board/shared/AddElementDialog.composable.unit.ts
@@ -1,4 +1,3 @@
-import { setupCollaboraFileSelectionMock } from "../test-utils/add-collabora-file-mock";
 import { setupSharedElementTypeSelectionMock } from "../test-utils/sharedElementTypeSelectionMock";
 import { useAddElementDialog } from "./AddElementDialog.composable";
 import { ElementTypeSelectionOptions } from "./SharedElementTypeSelection.composable";
@@ -9,6 +8,7 @@ import { injectStrict } from "@/utils/inject";
 import { createTestEnvStore, expectNotification, mockedPiniaStoreTyping, ObjectIdMock } from "@@/tests/test-utils";
 import { useNotificationStore } from "@data-app";
 import { useBoardFeatures, useBoardPermissions, useCardStore } from "@data-board";
+import { useAddCollaboraFile } from "@feature-collabora";
 import { createTestingPinia } from "@pinia/testing";
 import { useSharedLastCreatedElement } from "@util-board";
 import { flushPromises } from "@vue/test-utils";
@@ -49,6 +49,15 @@ vi.mocked(useBoardFeatures).mockImplementation(() => ({
 	isFeatureEnabled: vi.fn().mockReturnValue(true),
 }));
 
+vi.mock("@feature-collabora/composables/add-collabora-file.composable");
+const mockedUseAddCollaboraFile = vi.mocked(useAddCollaboraFile);
+const openCollaboraFileDialogMock = vi.fn();
+mockedUseAddCollaboraFile.mockReturnValue({
+	isCollaboraFileDialogOpen: ref(false),
+	openCollaboraFileDialog: openCollaboraFileDialogMock,
+	closeCollaboraFileDialog: vi.fn(),
+});
+
 describe("ElementTypeSelection Composable", () => {
 	beforeEach(() => {
 		setActivePinia(createTestingPinia());
@@ -64,7 +73,6 @@ describe("ElementTypeSelection Composable", () => {
 				const cardId = "cardId";
 
 				setupSharedElementTypeSelectionMock();
-				setupCollaboraFileSelectionMock();
 
 				const addElementMock = vi.fn();
 				const elementType = ContentElementType.RichText;
@@ -194,8 +202,6 @@ describe("ElementTypeSelection Composable", () => {
 			const { isDialogOpen, isDialogLoading, staticElementTypeOptions, dynamicElementTypeOptions } =
 				setupSharedElementTypeSelectionMock();
 
-			setupCollaboraFileSelectionMock();
-
 			createTestEnvStore({
 				FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED: true,
 				FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED: true,
@@ -355,12 +361,6 @@ describe("ElementTypeSelection Composable", () => {
 			const { staticElementTypeOptions } = setupSharedElementTypeSelectionMock({
 				closeDialogMock,
 			});
-			const openCollaboraFileDialogMock = vi.fn();
-			const setCardIdMock = vi.fn();
-			const { collaboraFileSelectionOptions } = setupCollaboraFileSelectionMock({
-				setCardIdMock,
-				openCollaboraFileDialogMock,
-			});
 
 			mockedUseBoardPermissions.mockReturnValue({
 				hasManageVideoConferencePermission: ref(hasManageVideoConferencePermission),
@@ -371,11 +371,8 @@ describe("ElementTypeSelection Composable", () => {
 
 			return {
 				elementTypeOptions: staticElementTypeOptions,
-				collaboraFileSelectionOptions,
 				addElementMock,
 				closeDialogMock,
-				openCollaboraFileDialogMock,
-				setCardIdMock,
 				cardId,
 			};
 		};
@@ -685,20 +682,8 @@ describe("ElementTypeSelection Composable", () => {
 				expect(closeDialogMock).toHaveBeenCalledTimes(1);
 			});
 
-			it("should set cardId", () => {
-				const { elementTypeOptions, addElementMock, cardId, setCardIdMock } = setup();
-				const { askType } = useAddElementDialog(addElementMock, cardId);
-
-				askType();
-
-				const option = elementTypeOptions.value.find((opt) => opt.testId === "create-element-file-with-collabora");
-				option?.action();
-
-				expect(setCardIdMock).toHaveBeenCalledTimes(1);
-			});
-
 			it("should set isCollaboraFileDialogOpen to true", () => {
-				const { elementTypeOptions, addElementMock, cardId, openCollaboraFileDialogMock } = setup();
+				const { elementTypeOptions, addElementMock, cardId } = setup();
 				const { askType } = useAddElementDialog(addElementMock, cardId);
 
 				askType();
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.ts b/src/modules/feature/board/shared/add-collabora-file.composable.ts
deleted file mode 100644
index afb8cb4fb5..0000000000
--- a/src/modules/feature/board/shared/add-collabora-file.composable.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { ContentElementType } from "@/serverApi/v3";
-import { AnyContentElement } from "@/types/board/ContentElement";
-import { FileElementContentSchema } from "@/types/board/ContentElement.schema";
-import { FileRecordParent } from "@/types/file/File";
-import { type CreateElementRequestPayload, useCardStore } from "@data-board";
-import { CollaboraFileType, useFileStorageApi } from "@data-file";
-import { useSharedFileSelect } from "@util-board";
-import { createSharedComposable } from "@vueuse/core";
-import { ref } from "vue";
-import { useI18n } from "vue-i18n";
-
-type CreateElementRequestFn = (payload: CreateElementRequestPayload) => Promise<AnyContentElement | undefined>;
-
-export const useAddCollaboraFile = createSharedComposable(() => {
-	const { t } = useI18n();
-	const { disableFileSelectOnMount, resetFileSelectOnMountEnabled } = useSharedFileSelect();
-	const { uploadCollaboraFile } = useFileStorageApi();
-	const cardStore = useCardStore();
-
-	const cardId = ref("");
-	const createElementRequestFn = ref<CreateElementRequestFn>(() => Promise.resolve(undefined));
-	const isCollaboraFileDialogOpen = ref<boolean>(false);
-
-	const closeCollaboraFileDialog = () => {
-		isCollaboraFileDialogOpen.value = false;
-	};
-
-	const openCollaboraFileDialog = () => {
-		isCollaboraFileDialogOpen.value = true;
-	};
-
-	const setCardId = (id: string) => {
-		cardId.value = id;
-	};
-
-	const setCreateElementRequestFn = (fn: CreateElementRequestFn) => {
-		createElementRequestFn.value = fn;
-	};
-
-	const updateFileElementCaption = async (element: AnyContentElement, caption: string) => {
-		if (!(caption && caption.trim().length > 0)) {
-			return;
-		}
-
-		const elementContent = FileElementContentSchema.parse(element.content);
-		elementContent.caption = caption;
-		element.content = elementContent;
-		await cardStore.updateElementRequest({ element });
-	};
-
-	const createFileElementWithCollaboraFile = async (type: CollaboraFileType, fileName: string, caption: string) => {
-		const element = await createElementRequestFn.value({
-			type: ContentElementType.File,
-			cardId: cardId.value,
-		});
-		if (!element) {
-			return;
-		}
-
-		try {
-			disableFileSelectOnMount();
-			await uploadCollaboraFile(type, element.id, FileRecordParent.BOARDNODES, fileName);
-			await updateFileElementCaption(element, caption.trim());
-		} catch {
-			await cardStore.deleteElementRequest({ elementId: element.id, cardId: cardId.value });
-		} finally {
-			resetFileSelectOnMountEnabled();
-			closeCollaboraFileDialog();
-		}
-	};
-
-	const collaboraFileSelectionOptions = [
-		{
-			id: "1",
-			label: t("components.elementTypeSelection.elements.collabora.option.text"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Text, fileName, caption),
-		},
-		{
-			id: "2",
-			label: t("components.elementTypeSelection.elements.collabora.option.spreadsheet"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Spreadsheet, fileName, caption),
-		},
-		{
-			id: "3",
-			label: t("components.elementTypeSelection.elements.collabora.option.presentation"),
-			action: async (fileName: string, caption: string) =>
-				createFileElementWithCollaboraFile(CollaboraFileType.Presentation, fileName, caption),
-		},
-	];
-
-	return {
-		cardId,
-		collaboraFileSelectionOptions,
-		isCollaboraFileDialogOpen,
-		openCollaboraFileDialog,
-		closeCollaboraFileDialog,
-		setCardId,
-		setCreateElementRequestFn,
-	};
-});
diff --git a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts b/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
deleted file mode 100644
index 8b6f2cf538..0000000000
--- a/src/modules/feature/board/shared/add-collabora-file.composable.unit.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { setupFileSelectMock } from "../../../util/board/test-utils/file-select-mock";
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { AnyContentElement, ContentElementType } from "@/types/board/ContentElement";
-import { fileElementResponseFactory, mockedPiniaStoreTyping } from "@@/tests/test-utils";
-import { useCardStore } from "@data-board";
-import * as FileStorageApi from "@data-file";
-import { createMock } from "@golevelup/ts-vitest";
-import { createTestingPinia } from "@pinia/testing";
-import { setActivePinia } from "pinia";
-
-vi.mock("vue-i18n", () => ({
-	useI18n: vi.fn().mockReturnValue({
-		t: vi.fn().mockImplementation((key: string) => key),
-		n: vi.fn().mockImplementation((key: string) => key),
-	}),
-}));
-
-vi.mock("../../../util/board/file-select.composable");
-const disableFileSelectOnMountMock = vi.fn();
-const resetFileSelectOnMountEnabledMock = vi.fn();
-setupFileSelectMock({
-	disableFileSelectOnMountMock,
-	resetFileSelectOnMountEnabledMock,
-});
-
-const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
-vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValue(fileStorageApiMock);
-
-let cardStore: ReturnType<typeof useCardStore>;
-
-describe("AddCollaboraFileComposable", () => {
-	const newElement: AnyContentElement = fileElementResponseFactory.build({
-		id: "new-element-id",
-	});
-
-	const getOrInitialiseBoardStore = () => {
-		cardStore = cardStore ?? mockedPiniaStoreTyping(useCardStore);
-		return cardStore;
-	};
-
-	const setup = (failOnElementCreate = false) => {
-		const {
-			openCollaboraFileDialog,
-			closeCollaboraFileDialog,
-			setCardId,
-			setCreateElementRequestFn,
-			collaboraFileSelectionOptions,
-			isCollaboraFileDialogOpen,
-			cardId,
-		} = useAddCollaboraFile();
-
-		const createElementRequestFnMock = vi.fn().mockResolvedValue(newElement);
-		if (failOnElementCreate) {
-			createElementRequestFnMock.mockResolvedValue(undefined);
-		}
-
-		setCreateElementRequestFn(createElementRequestFnMock);
-		setCardId("test-card-id");
-
-		cardStore = getOrInitialiseBoardStore();
-
-		return {
-			collaboraFileSelectionOptions,
-			createElementRequestFnMock,
-			openCollaboraFileDialog,
-			isCollaboraFileDialogOpen,
-			closeCollaboraFileDialog,
-			setCardId,
-			cardId,
-			cardStore,
-		};
-	};
-
-	beforeEach(() => {
-		setActivePinia(createTestingPinia());
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	describe("openCollaboraFileDialog", () => {
-		it("should set isCollaboraFileDialogOpen to true", () => {
-			const { openCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = false;
-			expect(isCollaboraFileDialogOpen.value).toBe(false);
-
-			openCollaboraFileDialog();
-
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-		});
-	});
-
-	describe("closeCollaboraFileDialog", () => {
-		it("should set isCollaboraFileDialogOpen to false", () => {
-			const { closeCollaboraFileDialog, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = true;
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-
-			closeCollaboraFileDialog();
-
-			expect(isCollaboraFileDialogOpen.value).toBe(false);
-		});
-	});
-
-	describe("setCardId", () => {
-		it("should set cardId", () => {
-			const { setCardId, cardId, isCollaboraFileDialogOpen } = setup();
-
-			isCollaboraFileDialogOpen.value = true;
-			expect(isCollaboraFileDialogOpen.value).toBe(true);
-
-			setCardId("test-card-id");
-
-			expect(cardId.value).toBe("test-card-id");
-		});
-	});
-
-	describe("collaboraFileSelectionOptions", () => {
-		it("provides options for collabora file types", () => {
-			const { collaboraFileSelectionOptions } = setup();
-
-			expect(collaboraFileSelectionOptions).toHaveLength(3);
-			expect(collaboraFileSelectionOptions[0].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.text"
-			);
-			expect(collaboraFileSelectionOptions[1].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.spreadsheet"
-			);
-			expect(collaboraFileSelectionOptions[2].label).toBe(
-				"components.elementTypeSelection.elements.collabora.option.presentation"
-			);
-		});
-
-		describe("action of collaboraFileSelectionOptions", () => {
-			it("should call createElementRequestFn with correct arguments", async () => {
-				const { collaboraFileSelectionOptions, createElementRequestFnMock } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-					expect(createElementRequestFnMock).toHaveBeenLastCalledWith({
-						type: ContentElementType.File,
-						cardId: "test-card-id",
-					});
-				}
-
-				expect(createElementRequestFnMock).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-			});
-
-			it("should disable file select on mount", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(disableFileSelectOnMountMock).toHaveBeenCalled();
-			});
-
-			it("should upload collabora file", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(fileStorageApiMock.uploadCollaboraFile).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-			});
-
-			describe("when a caption is provided", () => {
-				it("should update file element with caption", async () => {
-					const { collaboraFileSelectionOptions, cardStore } = setup();
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "My Caption");
-					}
-
-					expect(cardStore.updateElementRequest).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-				});
-			});
-
-			it("should finally reset file select on mount", async () => {
-				const { collaboraFileSelectionOptions } = setup();
-
-				for (const option of collaboraFileSelectionOptions) {
-					await option.action("test-office-file", "");
-				}
-
-				expect(resetFileSelectOnMountEnabledMock).toHaveBeenCalled();
-			});
-
-			describe("when element creation fails", () => {
-				it("should not upload collabora file", async () => {
-					const { collaboraFileSelectionOptions } = setup(true);
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "");
-					}
-
-					expect(fileStorageApiMock.uploadFromUrl).toHaveBeenCalledTimes(0);
-				});
-			});
-
-			describe("when file upload fails", () => {
-				it("should delete the created file element", async () => {
-					const { collaboraFileSelectionOptions } = setup();
-					fileStorageApiMock.uploadCollaboraFile.mockRejectedValue(new Error("Upload failed"));
-
-					for (const option of collaboraFileSelectionOptions) {
-						await option.action("test-office-file", "");
-					}
-
-					expect(cardStore.deleteElementRequest).toHaveBeenCalledTimes(collaboraFileSelectionOptions.length);
-				});
-			});
-		});
-	});
-});
diff --git a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts b/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
deleted file mode 100644
index a7a27d3e6c..0000000000
--- a/src/modules/feature/board/test-utils/add-collabora-file-mock.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useAddCollaboraFile } from "../shared/add-collabora-file.composable";
-import { Mock } from "vitest";
-import { ref } from "vue";
-
-interface Props {
-	openCollaboraFileDialogMock?: Mock;
-	setCardIdMock?: Mock;
-}
-
-export const setupCollaboraFileSelectionMock = (props: Props = {}) => {
-	const { setCardIdMock, openCollaboraFileDialogMock } = props;
-	const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
-
-	const openCollaboraFileDialog = openCollaboraFileDialogMock ?? vi.fn();
-	const closeCollaboraFileDialog = vi.fn();
-	const isCollaboraFileDialogOpen = ref(false);
-	const collaboraFileSelectionOptions = [
-		{
-			id: "1",
-			label: "Text Document",
-			action: vi.fn(),
-		},
-		{
-			id: "2",
-			label: "Table Document",
-			action: vi.fn(),
-		},
-	];
-	const setCardId = setCardIdMock ?? vi.fn();
-	const setCreateElementRequestFn = vi.fn();
-	const cardId = ref("");
-
-	const mocks = {
-		cardId,
-		collaboraFileSelectionOptions,
-		isCollaboraFileDialogOpen,
-		openCollaboraFileDialog,
-		closeCollaboraFileDialog,
-		setCardId,
-		setCreateElementRequestFn,
-	};
-
-	mockedCollaboraFileSelection.mockReturnValue(mocks);
-
-	return mocks;
-};
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
similarity index 75%
rename from src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
rename to src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
index cf4df1fda4..c20e3a8d26 100644
--- a/src/modules/feature/folder/AddCollaboraFileDialog.unit.ts
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.unit.ts
@@ -1,23 +1,18 @@
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { useAddCollaboraFile } from "../composables/add-collabora-file.composable";
 import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
-import { useFileStorageApi } from "@data-file";
-import { createMock } from "@golevelup/ts-vitest";
 import { Dialog } from "@ui-dialog";
 import { flushPromises, mount } from "@vue/test-utils";
 import { nextTick, ref } from "vue";
 import { VForm, VSelect } from "vuetify/lib/components/index";
 
-vi.mock("@data-file");
-vi.mock("./add-collabora-file.composable");
+vi.mock("../composables/add-collabora-file.composable");
 const mockedCollaboraFileSelection = vi.mocked(useAddCollaboraFile);
 mockedCollaboraFileSelection.mockReturnValue({
 	isCollaboraFileDialogOpen: ref(false),
 	openCollaboraFileDialog: vi.fn(),
 	closeCollaboraFileDialog: vi.fn(),
 });
-const mockFileStorageApi = createMock<ReturnType<typeof useFileStorageApi>>();
-vi.mocked(useFileStorageApi).mockReturnValue(mockFileStorageApi);
 
 describe("CollaboraFileDialog", () => {
 	const setupMocks = () => {
@@ -33,7 +28,6 @@ describe("CollaboraFileDialog", () => {
 		const setup = () => {
 			document.body.setAttribute("data-app", "true");
 
-			vi.clearAllMocks();
 			setupMocks();
 
 			const wrapper = mount(AddCollaboraFileDialog, {
@@ -41,9 +35,6 @@ describe("CollaboraFileDialog", () => {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 					stubs: { UseFocusTrap: true },
 				},
-				props: {
-					folderId: "folder-id",
-				},
 			});
 
 			return { wrapper };
@@ -66,9 +57,6 @@ describe("CollaboraFileDialog", () => {
 		const setup = async () => {
 			document.body.setAttribute("data-app", "true");
 
-			vi.clearAllMocks();
-			setupMocks();
-
 			const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = setupMocks();
 
 			const wrapper = mount(AddCollaboraFileDialog, {
@@ -76,9 +64,6 @@ describe("CollaboraFileDialog", () => {
 					plugins: [createTestingVuetify(), createTestingI18n()],
 					stubs: { UseFocusTrap: true },
 				},
-				props: {
-					folderId: "folder-id",
-				},
 				attachTo: document.body,
 			});
 
@@ -103,41 +88,37 @@ describe("CollaboraFileDialog", () => {
 		});
 
 		describe("when form is valid", () => {
-			it("should call item action", async () => {
+			it("should emit event", async () => {
 				const { wrapper } = await setup();
 
+				const typeSelect = wrapper.findComponent(VSelect);
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
+				await nextTick();
+				expect(typeSelect.find("input").element.value).toBe(selectOptions[0].value);
+
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
-				const typeSelect = wrapper.findComponent(VSelect);
-				const typeOptions = typeSelect.props("items") as Array<{ id: string; label: string; action: () => void }>;
-				expect(typeOptions.length).toBe(3);
-
 				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-
-				typeOptions.forEach(async (option) => {
-					await typeSelect.setValue(option.id);
-					await nextTick();
-
-					await form.trigger("submit");
-					await nextTick();
-				});
+				await form.trigger("submit");
+				await nextTick();
 				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).toHaveBeenCalledTimes(typeOptions.length);
+				expect(wrapper.emitted("create-collabora-file")).toBeTruthy();
 			});
 
 			it("should have confirm button enabled", async () => {
 				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
@@ -147,11 +128,11 @@ describe("CollaboraFileDialog", () => {
 		});
 
 		describe("when filetype is not selected", () => {
-			it("should not call item action", async () => {
+			it("should not emit event", async () => {
 				const { wrapper } = await setup();
 
 				const FILENAME = "myDocument";
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
@@ -159,15 +140,15 @@ describe("CollaboraFileDialog", () => {
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
+				expect(wrapper.emitted("create-collabora-file")).toBeFalsy();
 			});
 
 			it("should have confirm button disabled", async () => {
 				const { wrapper } = await setup();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
-				await fileNameInput.find("input").setValue("myDocument");
+				const FILENAME = "myDocument";
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
+				await fileNameInput.find("input").setValue(FILENAME);
 				await nextTick();
 
 				const dialog = wrapper.findComponent(Dialog);
@@ -176,32 +157,31 @@ describe("CollaboraFileDialog", () => {
 		});
 
 		describe("when filename is empty", () => {
-			it("should not call item action", async () => {
+			it("should not emit event", async () => {
 				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
 
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']").find("input");
+				expect(fileNameInput.element.value).toBe("");
+
 				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
 				await form.trigger("submit");
 				await nextTick();
 				await flushPromises();
-
-				expect(mockFileStorageApi.uploadCollaboraFile).not.toHaveBeenCalled();
+				expect(wrapper.emitted("create-collabora-file")).toBeFalsy();
 			});
 
 			it("should have confirm button disabled", async () => {
 				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
-				await nextTick();
-
-				const form = wrapper.findComponent("[data-testid='collabora-file-form']");
-				await form.trigger("submit");
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
-				await flushPromises();
 
 				const dialog = wrapper.findComponent(Dialog);
 				expect(dialog.props("confirmBtnDisabled")).toBe(true);
@@ -213,10 +193,11 @@ describe("CollaboraFileDialog", () => {
 				const { wrapper } = await setup();
 
 				const typeSelect = wrapper.findComponent(VSelect);
-				await typeSelect.setValue("1");
+				const selectOptions = typeSelect.props("items") as Array<{ title: string; value: string }>;
+				typeSelect.vm.$emit("update:modelValue", selectOptions[0].value);
 				await nextTick();
 
-				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-name']");
+				const fileNameInput = wrapper.findComponent("[data-testid='collabora-file-form-filename']");
 				await fileNameInput.find("input").setValue("invalid/filename");
 				await nextTick();
 
diff --git a/src/modules/feature/board/shared/AddCollaboraFileDialog.vue b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
similarity index 55%
rename from src/modules/feature/board/shared/AddCollaboraFileDialog.vue
rename to src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
index 3f82de20ba..ce3e848b26 100644
--- a/src/modules/feature/board/shared/AddCollaboraFileDialog.vue
+++ b/src/modules/feature/collabora/components/AddCollaboraFileDialog.vue
@@ -1,68 +1,63 @@
 <template>
 	<Dialog
 		v-model:is-dialog-open="isCollaboraFileDialogOpen"
-		:message="t('components.elementTypeSelection.elements.collabora.subtitle')"
+		:message="t('feature.collabora.add-collabora-file-dialog.title')"
 		:confirm-btn-disabled="!isFormValid"
 		confirm-btn-lang-key="common.actions.create"
-		data-testid="collabora-element-dialog"
+		data-testid="collabora-file-dialog"
 		@cancel="onCancel"
 		@confirm="onConfirm"
+		@click.stop
+		@keydown.enter.stop
 	>
 		<template #content>
-			<VForm id="officeFileForm" ref="form" data-testid="collabora-element-form" @submit.prevent="onConfirm">
+			<VForm id="collaboraFileForm" ref="form" data-testid="collabora-file-form" @submit.prevent="onConfirm">
 				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
 				<VSelect
 					v-model="selectedDocType"
 					:items="collaboraFileSelectionOptions"
-					item-title="label"
-					item-value="id"
 					persistent-hint
-					:label="t('components.cardElement.fileElement.collaboraFile.types')"
+					:label="t('feature.collabora.add-collabora-file-dialog.doc-types')"
 					:rules="docTypeRules"
-					:menu-props="{ attach: '#officeFileForm' }"
-					data-testid="collabora-element-form-type"
+					:menu-props="{ attach: '#collaboraFileForm' }"
+					data-testid="collabora-file-form-type"
 				/>
 				<VTextField
 					v-model="fileName"
 					:label="t('common.labels.fileName')"
 					:rules="fileNameRules"
-					:placeholder="t('components.cardElement.fileElement.collaboraFile.untitled')"
-					data-testid="collabora-element-form-filename"
-				/>
-				<VTextarea
-					v-model="caption"
-					rows="1"
-					:rules="captionRules"
-					auto-grow
-					:label="$t('components.cardElement.fileElement.caption')"
-					data-testid="collabora-element-form-caption"
+					:placeholder="t('feature.collabora.add-collabora-file-dialog.untitled-file')"
+					data-testid="collabora-file-form-filename"
 				/>
 			</VForm>
 		</template>
 	</Dialog>
 </template>
 <script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
+import { useAddCollaboraFile } from "../composables/add-collabora-file.composable";
+import type { CreateCollaboraFilePayload } from "../types/collabora-file";
+import { CollaboraFileType } from "@data-file";
 import { Dialog } from "@ui-dialog";
 import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
 import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
+const emit = defineEmits<{
+	(e: "create-collabora-file", payload: CreateCollaboraFilePayload): void;
+}>();
+
 type VuetifyForm = {
 	validate: () => Promise<{ valid: boolean }>;
 };
 
-const { isCollaboraFileDialogOpen, closeCollaboraFileDialog, collaboraFileSelectionOptions } = useAddCollaboraFile();
+const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
 const { validateOnOpeningTag } = useOpeningTagValidator();
 const { validateInvalidCharacters } = useInvalidCharactersValidator();
-
 const { t } = useI18n();
 
 const form = ref<VuetifyForm | null>(null);
-
-const selectedDocType = ref<string | null>(null);
+const selectedDocType = ref<CollaboraFileType | null>(null);
 const fileName = ref<string>("");
-const caption = ref<string>("");
 
 const docTypeRules = [isRequired(t("common.validation.required2"))];
 const fileNameRules = [
@@ -70,27 +65,36 @@ const fileNameRules = [
 	isRequired(t("common.validation.required2")),
 	(value: string) => validateInvalidCharacters(value, ["/"]),
 ];
-const captionRules = [(value: string) => validateOnOpeningTag(value)];
 
 const passesAllRules = (value: string, rules: ((value: string) => true | string)[]): boolean =>
 	rules.every((rule) => rule(value) === true);
 
+const collaboraFileSelectionOptions = [
+	{
+		title: t("feature.collabora.add-collabora-file-dialog.option.text"),
+		value: CollaboraFileType.Text,
+	},
+	{
+		title: t("feature.collabora.add-collabora-file-dialog.option.spreadsheet"),
+		value: CollaboraFileType.Spreadsheet,
+	},
+	{
+		title: t("feature.collabora.add-collabora-file-dialog.option.presentation"),
+		value: CollaboraFileType.Presentation,
+	},
+];
+
 const isFormValid = computed(() => {
 	if (!selectedDocType.value) {
 		return false;
 	}
 
-	const isFileNameValid = passesAllRules(fileName.value, fileNameRules);
-	const isCaptionValid = passesAllRules(caption.value, captionRules);
-	const isFormValid = isFileNameValid && isCaptionValid;
-
-	return isFormValid;
+	return passesAllRules(fileName.value, fileNameRules);
 });
 
 const resetForm = () => {
 	selectedDocType.value = null;
 	fileName.value = "";
-	caption.value = "";
 };
 
 const onCancel = () => {
@@ -100,14 +104,13 @@ const onCancel = () => {
 
 const onConfirm = async () => {
 	if (!form?.value) return;
+	if (!selectedDocType.value) return;
 
 	const { valid } = await form.value.validate();
 	if (!valid) return;
 
+	emit("create-collabora-file", { type: selectedDocType.value, fileName: fileName.value });
 	closeCollaboraFileDialog();
-	await collaboraFileSelectionOptions
-		.find((item) => item.id === selectedDocType.value)
-		?.action(fileName.value, caption.value);
 	resetForm();
 };
 </script>
diff --git a/src/modules/feature/folder/add-collabora-file.composable.ts b/src/modules/feature/collabora/composables/add-collabora-file.composable.ts
similarity index 100%
rename from src/modules/feature/folder/add-collabora-file.composable.ts
rename to src/modules/feature/collabora/composables/add-collabora-file.composable.ts
diff --git a/src/modules/feature/folder/add-collabora-file.composable.unit.ts b/src/modules/feature/collabora/composables/add-collabora-file.composable.unit.ts
similarity index 100%
rename from src/modules/feature/folder/add-collabora-file.composable.unit.ts
rename to src/modules/feature/collabora/composables/add-collabora-file.composable.unit.ts
diff --git a/src/modules/feature/collabora/index.ts b/src/modules/feature/collabora/index.ts
index cf082ff5e9..a8cd4d7929 100644
--- a/src/modules/feature/collabora/index.ts
+++ b/src/modules/feature/collabora/index.ts
@@ -1,3 +1,8 @@
+import AddCollaboraFileDialog from "./components/AddCollaboraFileDialog.vue";
 import CollaboraEditor from "./components/CollaboraEditor.vue";
+import { useAddCollaboraFile } from "./composables/add-collabora-file.composable";
+import type { CreateCollaboraFilePayload } from "./types/collabora-file";
 
-export { CollaboraEditor };
+export { AddCollaboraFileDialog, CollaboraEditor, useAddCollaboraFile };
+
+export type { CreateCollaboraFilePayload };
diff --git a/src/modules/feature/collabora/types/collabora-file.ts b/src/modules/feature/collabora/types/collabora-file.ts
new file mode 100644
index 0000000000..5474c37cc4
--- /dev/null
+++ b/src/modules/feature/collabora/types/collabora-file.ts
@@ -0,0 +1,6 @@
+import { CollaboraFileType } from "@data-file";
+
+export type CreateCollaboraFilePayload = {
+	type: CollaboraFileType;
+	fileName: string;
+};
diff --git a/src/modules/feature/folder/AddCollaboraFileDialog.vue b/src/modules/feature/folder/AddCollaboraFileDialog.vue
deleted file mode 100644
index 101eb03690..0000000000
--- a/src/modules/feature/folder/AddCollaboraFileDialog.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-	<Dialog
-		v-model:is-dialog-open="isCollaboraFileDialogOpen"
-		:message="t('pages.folder.add-collabora-file-dialog.title')"
-		:confirm-btn-disabled="!isFormValid"
-		confirm-btn-lang-key="common.actions.create"
-		data-testid="collabora-file-dialog"
-		@cancel="onCancel"
-		@confirm="onConfirm"
-	>
-		<template #content>
-			<VForm id="collaboraFileForm" ref="form" data-testid="collabora-file-form" @submit.prevent="onConfirm">
-				<!-- Attach the select to the form so that we can use focusTrap in the dialog -->
-				<VSelect
-					v-model="selectedDocType"
-					:items="collaboraFileSelectionOptions"
-					item-title="label"
-					item-value="id"
-					persistent-hint
-					:label="t('pages.folder.add-collabora-file-dialog.doc-types')"
-					:rules="docTypeRules"
-					:menu-props="{ attach: '#collaboraFileForm' }"
-					data-testid="collabora-file-type"
-				/>
-				<VTextField
-					v-model="fileName"
-					:label="t('common.labels.fileName')"
-					:rules="fileNameRules"
-					:placeholder="t('pages.folder.add-collabora-file-dialog.untitled-file')"
-					data-testid="collabora-file-name"
-				/>
-			</VForm>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import { FileRecord, FileRecordParent } from "@/types/file/File";
-import { CollaboraFileType, useFileStorageApi } from "@data-file";
-import { Dialog } from "@ui-dialog";
-import { isRequired, useInvalidCharactersValidator, useOpeningTagValidator } from "@util-validators";
-import { computed, ref } from "vue";
-import { useI18n } from "vue-i18n";
-
-const props = defineProps({
-	folderId: {
-		type: String,
-		required: true,
-	},
-});
-
-const emit = defineEmits<{
-	(collaboraFileAdded: "collabora-file-added", newFile: FileRecord): void;
-}>();
-
-type VuetifyForm = {
-	validate: () => Promise<{ valid: boolean }>;
-};
-
-const { uploadCollaboraFile } = useFileStorageApi();
-const { isCollaboraFileDialogOpen, closeCollaboraFileDialog } = useAddCollaboraFile();
-const { validateOnOpeningTag } = useOpeningTagValidator();
-const { validateInvalidCharacters } = useInvalidCharactersValidator();
-const { t } = useI18n();
-
-const form = ref<VuetifyForm | null>(null);
-const selectedDocType = ref<string | null>(null);
-const fileName = ref<string>("");
-
-const uploadCollaboraFileFn = async (type: CollaboraFileType, folderId: string, fileName: string) => {
-	const fileRecord = await uploadCollaboraFile(type, folderId, FileRecordParent.BOARDNODES, fileName);
-	closeCollaboraFileDialog();
-
-	return fileRecord;
-};
-
-const collaboraFileSelectionOptions = [
-	{
-		id: "1",
-		label: t("pages.folder.add-collabora-file-dialog.option.text"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Text, folderId, fileName),
-	},
-	{
-		id: "2",
-		label: t("pages.folder.add-collabora-file-dialog.option.spreadsheet"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Spreadsheet, folderId, fileName),
-	},
-	{
-		id: "3",
-		label: t("pages.folder.add-collabora-file-dialog.option.presentation"),
-		action: async (folderId: string, fileName: string) =>
-			uploadCollaboraFileFn(CollaboraFileType.Presentation, folderId, fileName),
-	},
-];
-
-const docTypeRules = [isRequired(t("common.validation.required2"))];
-
-const fileNameRules = [
-	(value: string) => validateOnOpeningTag(value),
-	isRequired(t("common.validation.required2")),
-	(value: string) => validateInvalidCharacters(value, ["/"]),
-];
-
-const passesAllRules = (value: string, rules: ((value: string) => true | string)[]): boolean =>
-	rules.every((rule) => rule(value) === true);
-
-const isFormValid = computed(() => {
-	if (!selectedDocType.value) {
-		return false;
-	}
-
-	const isFileNameValid = passesAllRules(fileName.value, fileNameRules);
-
-	return isFileNameValid;
-});
-
-const resetForm = () => {
-	selectedDocType.value = null;
-	fileName.value = "";
-};
-
-const onCancel = () => {
-	resetForm();
-	closeCollaboraFileDialog();
-};
-
-const onConfirm = async () => {
-	if (!form?.value) return;
-
-	const { valid } = await form.value.validate();
-	if (!valid) return;
-
-	closeCollaboraFileDialog();
-	const newFile = await collaboraFileSelectionOptions
-		.find((item) => item.id === selectedDocType.value)
-		?.action(props.folderId, fileName.value);
-
-	if (newFile) {
-		emit("collabora-file-added", newFile);
-	}
-	resetForm();
-};
-</script>
diff --git a/src/modules/feature/folder/Folder.unit.ts b/src/modules/feature/folder/Folder.unit.ts
index 4baced3b32..1ee957aaba 100644
--- a/src/modules/feature/folder/Folder.unit.ts
+++ b/src/modules/feature/folder/Folder.unit.ts
@@ -1,5 +1,3 @@
-import * as AddCollaboraFile from "./add-collabora-file.composable";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import DeleteFileDialog from "./file-table/DeleteFileDialog.vue";
 import EmptyFolderSvg from "./file-table/EmptyFolderSvg.vue";
 import KebabMenuActionDeleteFiles from "./file-table/KebabMenuActionDeleteFiles.vue";
@@ -11,7 +9,7 @@ import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useBoardStore } from "@/modules/data/board/Board.store";
 import { ParentNodeInfo, ParentNodeType } from "@/types/board/ContentElement";
-import { FileRecord, FileRecordParent } from "@/types/file/File";
+import { FileRecordParent } from "@/types/file/File";
 import * as FileHelper from "@/utils/fileHelper";
 import {
 	boardResponseFactory,
@@ -23,7 +21,9 @@ import {
 import { createTestingI18n, createTestingVuetify } from "@@/tests/test-utils/setup";
 import * as BoardApi from "@data-board";
 import * as FileStorageApi from "@data-file";
+import { CollaboraFileType } from "@data-file";
 import * as FolderState from "@data-folder";
+import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { createMock, DeepMocked } from "@golevelup/ts-vitest";
 import { createTestingPinia } from "@pinia/testing";
 import * as ConfirmationDialog from "@ui-confirmation-dialog";
@@ -43,7 +43,8 @@ const useRouterMock = <Mock>useRouter;
 vi.mock("@data-board/BoardApi.composable");
 const mockedUseBoardApi = vi.mocked(BoardApi.useBoardApi);
 
-vi.mock("./add-collabora-file.composable");
+vi.mock("@feature-collabora/composables/add-collabora-file.composable");
+const mockedUseAddCollaboraFile = vi.mocked(useAddCollaboraFile);
 
 const enum FabEvent {
 	CreateDocument = "CREATE_DOCUMENT",
@@ -122,11 +123,8 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-					vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
-						openCollaboraFileDialog: vi.fn(),
-						closeCollaboraFileDialog: vi.fn(),
-						isCollaboraFileDialogOpen: ref(false),
-					});
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
 
 					const { wrapper } = setupWrapper();
 					const useBoardStoreMock = mockedPiniaStoreTyping(useBoardStore);
@@ -252,6 +250,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					setupWrapper();
 
 					await nextTick();
@@ -306,6 +307,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await nextTick();
@@ -372,6 +376,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -444,6 +451,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -507,6 +517,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -571,6 +584,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -658,6 +674,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper, router } = setupWrapper();
 
 					const kebabMenu = wrapper.find("[data-testid='folder-menu']");
@@ -732,6 +751,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -796,6 +818,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -858,6 +883,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await nextTick();
@@ -929,6 +957,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -996,6 +1027,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -1060,6 +1094,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await nextTick();
@@ -1125,6 +1162,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				return { wrapper };
@@ -1169,11 +1209,11 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				const mockOpenCollaboraFileDialog = vi.fn();
-				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
-					openCollaboraFileDialog: mockOpenCollaboraFileDialog,
-					closeCollaboraFileDialog: vi.fn(),
+				const mockedOpenCollaboraFileDialog = vi.fn();
+				mockedUseAddCollaboraFile.mockReturnValue({
 					isCollaboraFileDialogOpen: ref(false),
+					openCollaboraFileDialog: mockedOpenCollaboraFileDialog,
+					closeCollaboraFileDialog: vi.fn(),
 				});
 
 				createTestEnvStore({
@@ -1187,7 +1227,7 @@ describe("Folder.vue", () => {
 
 				return {
 					wrapper,
-					mockOpenCollaboraFileDialog,
+					mockedOpenCollaboraFileDialog,
 				};
 			};
 
@@ -1256,17 +1296,17 @@ describe("Folder.vue", () => {
 
 			describe("and create document is chosen", () => {
 				it("should open collabora file dialog", async () => {
-					const { wrapper, mockOpenCollaboraFileDialog } = await setup();
+					const { wrapper, mockedOpenCollaboraFileDialog } = await setup();
 
 					const defaultWireframe = wrapper.findComponent(DefaultWireframe);
 					await defaultWireframe.vm.$emit("onFabItemClick", FabEvent.CreateDocument);
 
-					expect(mockOpenCollaboraFileDialog).toHaveBeenCalled();
+					expect(mockedOpenCollaboraFileDialog).toHaveBeenCalled();
 				});
 			});
 		});
 
-		describe("when collabora file was created", () => {
+		describe("when collabora file should be created", () => {
 			const setup = async () => {
 				const folderStateMock = createMock<ReturnType<typeof FolderState.useFolderState>>();
 				vi.spyOn(FolderState, "useFolderState").mockReturnValueOnce(folderStateMock);
@@ -1297,11 +1337,8 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
-				vi.spyOn(AddCollaboraFile, "useAddCollaboraFile").mockReturnValue({
-					openCollaboraFileDialog: vi.fn(),
-					closeCollaboraFileDialog: vi.fn(),
-					isCollaboraFileDialogOpen: ref(false),
-				});
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
 
 				const windowOpenMock = vi.fn();
 				const windowOpenSpy = vi.spyOn(window, "open").mockImplementation(windowOpenMock);
@@ -1315,18 +1352,49 @@ describe("Folder.vue", () => {
 				return {
 					wrapper,
 					windowOpenSpy,
+					fileStorageApiMock,
 				};
 			};
 
+			it("should upload collabora file", async () => {
+				const { wrapper, fileStorageApiMock } = await setup();
+
+				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
+
+				expect(fileStorageApiMock.uploadCollaboraFile).toHaveBeenCalled();
+			});
+
 			it("should show open collabora file in new tab", async () => {
 				const { wrapper, windowOpenSpy } = await setup();
 
 				const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
-				const newFile: FileRecord = fileRecordFactory.build();
-				await collaboraFileDialog.vm.$emit("collabora-file-added", newFile);
+				await collaboraFileDialog.vm.$emit("create-collabora-file", {
+					type: CollaboraFileType.Text,
+					fileName: "myDoc",
+				});
 
 				expect(windowOpenSpy).toHaveBeenCalled();
 			});
+
+			describe("and upload fails", () => {
+				it("should not open new tab", async () => {
+					const { wrapper, windowOpenSpy, fileStorageApiMock } = await setup();
+
+					fileStorageApiMock.uploadCollaboraFile.mockReturnValueOnce(undefined);
+
+					const collaboraFileDialog = wrapper.findComponent(AddCollaboraFileDialog);
+					await collaboraFileDialog.vm.$emit("create-collabora-file", {
+						type: CollaboraFileType.Text,
+						fileName: "myDoc",
+					});
+
+					expect(windowOpenSpy).not.toHaveBeenCalled();
+				});
+			});
 		});
 
 		describe("when fab button is clicked, file upload is chosen, files are selected and upload succeed", () => {
@@ -1376,6 +1444,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper, parentId } = setupWrapper();
 
 				await nextTick();
@@ -1506,6 +1577,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper, parentId } = setupWrapper();
 
 				await nextTick();
@@ -1605,6 +1679,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1662,6 +1739,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1709,8 +1789,8 @@ describe("Folder.vue", () => {
 				folderStateMock.folderName = folderName;
 				folderStateMock.breadcrumbs = ref([]) as unknown as ComputedRef;
 
-				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
-				mockedUseBoardApi.mockReturnValue(boardApiMock);
+				const boardState = createMock<ReturnType<typeof BoardApi.useSharedBoardPageInformation>>({});
+				vi.spyOn(BoardApi, "useSharedBoardPageInformation").mockReturnValueOnce(boardState);
 
 				const fileStorageApiMock = createMock<ReturnType<typeof FileStorageApi.useFileStorageApi>>();
 				vi.spyOn(FileStorageApi, "useFileStorageApi").mockReturnValueOnce(fileStorageApiMock);
@@ -1719,6 +1799,9 @@ describe("Folder.vue", () => {
 				const fileRecord2 = fileRecordFactory.build();
 				fileStorageApiMock.getFileRecordsByParentId.mockReturnValueOnce([fileRecord1, fileRecord2]);
 
+				const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
+				mockedUseBoardApi.mockReturnValue(boardApiMock);
+
 				const useBoardStoreMock = createMock<ReturnType<typeof BoardApi.useBoardStore>>();
 				vi.spyOn(BoardApi, "useBoardStore").mockReturnValueOnce(useBoardStoreMock);
 
@@ -1727,6 +1810,9 @@ describe("Folder.vue", () => {
 				});
 				vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+				const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+				mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 				const { wrapper } = setupWrapper();
 
 				await flushPromises();
@@ -1795,6 +1881,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const { wrapper } = setupWrapper();
 
 					await flushPromises();
@@ -1858,6 +1947,9 @@ describe("Folder.vue", () => {
 					});
 					vi.spyOn(BoardApi, "useBoardPermissions").mockReturnValueOnce(useBoardPermissionsMock);
 
+					const addCollaboraFileMock = createMock<ReturnType<typeof useAddCollaboraFile>>();
+					mockedUseAddCollaboraFile.mockReturnValue(addCollaboraFileMock);
+
 					const boardApiMock = createMock<ReturnType<typeof BoardApi.useBoardApi>>();
 					mockedUseBoardApi.mockReturnValue(boardApiMock);
 
diff --git a/src/modules/feature/folder/Folder.vue b/src/modules/feature/folder/Folder.vue
index 96e016618a..5d173432dd 100644
--- a/src/modules/feature/folder/Folder.vue
+++ b/src/modules/feature/folder/Folder.vue
@@ -41,12 +41,10 @@
 	/>
 	<input ref="fileInput" type="file" multiple hidden data-testid="input-folder-fileupload" aria-hidden="true" />
 	<LightBox />
-	<AddCollaboraFileDialog :folder-id="folderId" @collabora-file-added="collaboraFileAddedHandler" />
+	<AddCollaboraFileDialog @create-collabora-file="onCreateCollaboraFile" />
 </template>
 
 <script setup lang="ts">
-import { useAddCollaboraFile } from "./add-collabora-file.composable";
-import AddCollaboraFileDialog from "./AddCollaboraFileDialog.vue";
 import FileTable from "./file-table/FileTable.vue";
 import FolderMenu from "./FolderMenu.vue";
 import RenameFolderDialog from "./RenameFolderDialog.vue";
@@ -64,6 +62,8 @@ import { useBoardPermissions, useSharedBoardPageInformation } from "@data-board"
 import { useEnvConfig } from "@data-env";
 import { useFileStorageApi } from "@data-file";
 import { useFolderState } from "@data-folder";
+import type { CreateCollaboraFilePayload } from "@feature-collabora";
+import { AddCollaboraFileDialog, useAddCollaboraFile } from "@feature-collabora";
 import { mdiFileDocumentPlusOutline, mdiPlus, mdiTrayArrowUp } from "@icons/material";
 import { ConfirmationDialog } from "@ui-confirmation-dialog";
 import { LightBox } from "@ui-light-box";
@@ -93,7 +93,7 @@ const { breadcrumbs, folderName, fetchFileFolderElement, parent, mapNodeTypeToPa
 
 const { createPageInformation } = useSharedBoardPageInformation();
 
-const { fetchFiles, upload, getFileRecordsByParentId, deleteFiles, rename } = useFileStorageApi();
+const { fetchFiles, upload, uploadCollaboraFile, getFileRecordsByParentId, deleteFiles, rename } = useFileStorageApi();
 
 const boardStore = useBoardStore();
 
@@ -170,19 +170,6 @@ const fabItemClickHandler = (event: string | undefined): void => {
 	}
 };
 
-const collaboraFileAddedHandler = (newFile: FileRecord) => {
-	const url = router.resolve({
-		name: "collabora",
-		params: {
-			id: newFile.id,
-		},
-		query: {
-			edit: hasEditPermission.value.toString(),
-		},
-	}).href;
-	window.open(url, "_blank");
-};
-
 const onDelete = async (confirmation: Promise<boolean>) => {
 	const shouldDelete = await confirmation;
 
@@ -250,6 +237,27 @@ const onRenameCancel = () => {
 	isRenameDialogOpen.value = false;
 };
 
+const onCreateCollaboraFile = async (payload: CreateCollaboraFilePayload) => {
+	const newFile = await uploadCollaboraFile(
+		payload.type,
+		props.folderId,
+		FileRecordParent.BOARDNODES,
+		payload.fileName
+	);
+	if (!newFile) return;
+
+	const url = router.resolve({
+		name: "collabora",
+		params: {
+			id: newFile.id,
+		},
+		query: {
+			edit: hasEditPermission.value.toString(),
+		},
+	}).href;
+	window.open(url, "_blank");
+};
+
 const resetUploadProgress = () => {
 	uploadProgress.value = { uploaded: 0, total: 0 };
 };