diff --git a/src/components/organisms/vCustomDialog.vue b/src/components/organisms/vCustomDialog.vue
index 2e82f7d350..df7af81d79 100644
--- a/src/components/organisms/vCustomDialog.vue
+++ b/src/components/organisms/vCustomDialog.vue
@@ -62,6 +62,8 @@
 <script setup lang="ts">
 import { ModelRef, PropType } from "vue";
 
+export type VCustomDialogButton = "back" | "edit" | "cancel" | "confirm" | "close" | "next";
+
 const props = defineProps({
 	size: {
 		type: Number,
@@ -89,7 +91,7 @@ const props = defineProps({
 		type: Boolean,
 	},
 	buttons: {
-		type: Array as PropType<("back" | "edit" | "cancel" | "confirm" | "close" | "next")[]>,
+		type: Array as PropType<VCustomDialogButton[]>,
 		default: () => ["cancel", "confirm"],
 	},
 });
diff --git a/src/components/share/ShareModal.unit.ts b/src/components/share/ShareModal.unit.ts
index 9ab0d0d45b..b1101629a4 100644
--- a/src/components/share/ShareModal.unit.ts
+++ b/src/components/share/ShareModal.unit.ts
@@ -1,5 +1,4 @@
 import ShareModal from "./ShareModal.vue";
-import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
 import ShareModalOptionsForm from "@/components/share/ShareModalOptionsForm.vue";
 import ShareModalResult from "@/components/share/ShareModalResult.vue";
 import { ShareTokenBodyParamsParentTypeEnum } from "@/serverApi/v3";
@@ -13,6 +12,8 @@ import { InfoAlert, WarningAlert } from "@ui-alert";
 import { mount } from "@vue/test-utils";
 import { setActivePinia } from "pinia";
 import { beforeEach } from "vitest";
+import { nextTick } from "vue";
+import { VDialog } from "vuetify/components/VDialog";
 
 describe("@/components/share/ShareModal", () => {
 	beforeEach(() => {
@@ -29,6 +30,7 @@ describe("@/components/share/ShareModal", () => {
 					provide: {
 						[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
 					},
+					stubs: { UseFocusTrap: true },
 				},
 				props: {
 					type: ShareTokenBodyParamsParentTypeEnum.Courses,
@@ -66,31 +68,56 @@ describe("@/components/share/ShareModal", () => {
 
 		it("should call 'createShareUrl' store method when next button clicked", () => {
 			const { wrapper } = setup();
-			const dialog = wrapper.findComponent(vCustomDialog);
+			const dialog = wrapper.findComponent(VDialog);
 
-			dialog.vm.$emit("next");
+			const buttons = dialog.findAllComponents({
+				name: "v-btn",
+				props: { variant: "flat" },
+			});
+			expect(buttons.length).toBe(2);
+			expect(buttons[0].text()).toBe("common.actions.cancel");
+			expect(buttons[1].text()).toBe("common.actions.continue");
+
+			buttons[1].vm.$emit("click");
 
 			expect(shareModuleMock.createShareUrl).toHaveBeenCalled();
 		});
 
 		it("should call 'resetShareFlow' store method when dialog closed", () => {
 			const { wrapper } = setup();
-			const dialog = wrapper.findComponent(vCustomDialog);
+			const dialog = wrapper.findComponent(VDialog);
 
-			dialog.vm.$emit("dialog-closed");
+			dialog.vm.$emit("after-leave");
 
 			expect(shareModuleMock.resetShareFlow).toHaveBeenCalled();
 		});
 
-		it("should call 'resetShareFlow' store method when sub component emits 'done'", () => {
+		it("should return the component state to firstStep when dialog closes", () => {
+			const { wrapper } = setup();
+			const dialog = wrapper.findComponent(VDialog);
+
+			expect((wrapper.vm as unknown as typeof ShareModal).step).toBe("firstStep");
+
+			(wrapper.vm as unknown as typeof ShareModal).onNext();
+			expect((wrapper.vm as unknown as typeof ShareModal).step).toBe("secondStep");
+
+			dialog.vm.$emit("after-leave");
+			wrapper.vm.$nextTick();
+			expect((wrapper.vm as unknown as typeof ShareModal).step).toBe("firstStep");
+		});
+
+		it("should call 'resetShareFlow' store method when sub component emits 'done'", async () => {
 			shareModuleMock = createModuleMocks(ShareModule, {
 				getIsShareModalOpen: true,
 				getParentType: ShareTokenBodyParamsParentTypeEnum.Courses,
 				getShareUrl: "http://example.com",
 			});
 			const { wrapper } = setup();
-			const form = wrapper.findComponent(ShareModalResult);
 
+			(wrapper.vm as unknown as typeof ShareModal).step = "secondStep";
+			await nextTick();
+
+			const form = wrapper.findComponent(ShareModalResult);
 			form.vm.$emit("done");
 
 			expect(shareModuleMock.resetShareFlow).toHaveBeenCalled();
@@ -106,13 +133,17 @@ describe("@/components/share/ShareModal", () => {
 			expect((wrapper.vm as unknown as typeof ShareModal).shareOptions).toStrictEqual(payload);
 		});
 
-		it("should call 'onCopy' method when sub component emits 'copied'", () => {
+		it("should call 'onCopy' method when 'onNext' is called'", async () => {
 			shareModuleMock = createModuleMocks(ShareModule, {
 				getIsShareModalOpen: true,
 				getParentType: ShareTokenBodyParamsParentTypeEnum.Courses,
 				getShareUrl: "http://example.com",
 			});
 			const { wrapper } = setup();
+
+			(wrapper.vm as unknown as typeof ShareModal).onNext();
+			await wrapper.vm.$nextTick();
+
 			const form = wrapper.findComponent(ShareModalResult);
 
 			form.vm.$emit("copied");
@@ -127,181 +158,182 @@ describe("@/components/share/ShareModal", () => {
 		});
 
 		describe("ctl tool info", () => {
-			it("should have the correct title", () => {
+			it("should have the correct title", async () => {
 				const { wrapper } = setup();
 
-				const dialog = wrapper.findComponent(vCustomDialog);
-				const cardText = dialog.findComponent({ name: "v-card-text" });
-
+				const cardText = wrapper.findComponent({ name: "v-card-text" });
 				const infotext = cardText.find(`[data-testid="share-modal-external-tools-info"]`);
 
-				expect(infotext.isVisible()).toBe(true);
-				expect(infotext.text()).toEqual("components.molecules.shareImport.options.ctlTools.infoText.unavailable");
+				expect(infotext.text()).toContain("components.molecules.shareImport.options.ctlTools.infoText.unavailable");
 			});
 		});
-	});
 
-	describe("when room is shared", () => {
-		const setup = () => {
-			const shareModuleMock = createModuleMocks(ShareModule, {
-				getIsShareModalOpen: true,
-				getParentType: ShareTokenBodyParamsParentTypeEnum.Room,
-				createShareUrl: vi.fn(),
-				resetShareFlow: vi.fn(),
-			});
-
-			const wrapper = mount(ShareModal, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					provide: {
-						[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+		describe("when room is shared", () => {
+			const setup = () => {
+				const shareModuleMock = createModuleMocks(ShareModule, {
+					getIsShareModalOpen: true,
+					getParentType: ShareTokenBodyParamsParentTypeEnum.Room,
+					createShareUrl: vi.fn(),
+					resetShareFlow: vi.fn(),
+				});
+
+				const wrapper = mount(ShareModal, {
+					global: {
+						plugins: [createTestingVuetify(), createTestingI18n()],
+						provide: {
+							[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+						},
+						stubs: { UseFocusTrap: true },
 					},
-				},
-				props: {
-					type: ShareTokenBodyParamsParentTypeEnum.Room,
-				},
-			});
+					props: {
+						type: ShareTokenBodyParamsParentTypeEnum.Room,
+					},
+				});
 
-			return {
-				wrapper,
+				return {
+					wrapper,
+				};
 			};
-		};
-
-		it("should show copyright and privacy info alert", () => {
-			const { wrapper } = setup();
-			const infoAlert = wrapper.findComponent(InfoAlert);
 
-			expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
-		});
+			it("should show copyright and privacy info alert", () => {
+				const { wrapper } = setup();
+				const infoAlert = wrapper.findComponent(InfoAlert);
 
-		it("should show warning alert", () => {
-			const { wrapper } = setup();
-			const warningAlert = wrapper.findComponent(WarningAlert);
+				expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
+			});
 
-			expect(warningAlert.exists()).toBe(true);
-		});
-	});
+			it("should show warning alert", () => {
+				const { wrapper } = setup();
+				const warningAlert = wrapper.findComponent(WarningAlert);
 
-	describe("when column board is shared", () => {
-		const setup = () => {
-			const shareModuleMock = createModuleMocks(ShareModule, {
-				getIsShareModalOpen: true,
-				getParentType: ShareTokenBodyParamsParentTypeEnum.ColumnBoard,
-				createShareUrl: vi.fn(),
-				resetShareFlow: vi.fn(),
+				expect(warningAlert.exists()).toBe(true);
 			});
+		});
 
-			const wrapper = mount(ShareModal, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					provide: {
-						[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+		describe("when column board is shared", () => {
+			const setup = () => {
+				const shareModuleMock = createModuleMocks(ShareModule, {
+					getIsShareModalOpen: true,
+					getParentType: ShareTokenBodyParamsParentTypeEnum.ColumnBoard,
+					createShareUrl: vi.fn(),
+					resetShareFlow: vi.fn(),
+				});
+
+				const wrapper = mount(ShareModal, {
+					global: {
+						plugins: [createTestingVuetify(), createTestingI18n()],
+						provide: {
+							[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+						},
+						stubs: { UseFocusTrap: true },
 					},
-				},
-				props: {
-					type: ShareTokenBodyParamsParentTypeEnum.ColumnBoard,
-				},
-			});
+					props: {
+						type: ShareTokenBodyParamsParentTypeEnum.ColumnBoard,
+					},
+				});
 
-			return {
-				wrapper,
+				return {
+					wrapper,
+				};
 			};
-		};
-
-		it("should show copyright and privacy info alert", () => {
-			const { wrapper } = setup();
-			const infoAlert = wrapper.findComponent(InfoAlert);
 
-			expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
-		});
+			it("should show copyright and privacy info alert", () => {
+				const { wrapper } = setup();
+				const infoAlert = wrapper.findComponent(InfoAlert);
 
-		it("should show warning alert", () => {
-			const { wrapper } = setup();
-			const warningAlert = wrapper.findComponent(WarningAlert);
+				expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
+			});
 
-			expect(warningAlert.exists()).toBe(true);
-		});
-	});
+			it("should show warning alert", () => {
+				const { wrapper } = setup();
+				const warningAlert = wrapper.findComponent(WarningAlert);
 
-	describe("when lesson is shared", () => {
-		const setup = () => {
-			const shareModuleMock = createModuleMocks(ShareModule, {
-				getIsShareModalOpen: true,
-				getParentType: ShareTokenBodyParamsParentTypeEnum.Lessons,
-				createShareUrl: vi.fn(),
-				resetShareFlow: vi.fn(),
+				expect(warningAlert.exists()).toBe(true);
 			});
+		});
 
-			const wrapper = mount(ShareModal, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					provide: {
-						[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+		describe("when lesson is shared", () => {
+			const setup = () => {
+				const shareModuleMock = createModuleMocks(ShareModule, {
+					getIsShareModalOpen: true,
+					getParentType: ShareTokenBodyParamsParentTypeEnum.Lessons,
+					createShareUrl: vi.fn(),
+					resetShareFlow: vi.fn(),
+				});
+
+				const wrapper = mount(ShareModal, {
+					global: {
+						plugins: [createTestingVuetify(), createTestingI18n()],
+						provide: {
+							[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+						},
+						stubs: { UseFocusTrap: true },
 					},
-				},
-				props: {
-					type: ShareTokenBodyParamsParentTypeEnum.Lessons,
-				},
-			});
+					props: {
+						type: ShareTokenBodyParamsParentTypeEnum.Lessons,
+					},
+				});
 
-			return {
-				wrapper,
+				return {
+					wrapper,
+				};
 			};
-		};
-
-		it("should show copyright and privacy info alert", () => {
-			const { wrapper } = setup();
-			const infoAlert = wrapper.findComponent(InfoAlert);
 
-			expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
-		});
+			it("should show copyright and privacy info alert", () => {
+				const { wrapper } = setup();
+				const infoAlert = wrapper.findComponent(InfoAlert);
 
-		it("should show warning alert", () => {
-			const { wrapper } = setup();
-			const warningAlert = wrapper.findComponent(WarningAlert);
+				expect(infoAlert.text()).toBe("components.molecules.share.checkPrivacyAndCopyright");
+			});
 
-			expect(warningAlert.exists()).toBe(true);
-		});
-	});
+			it("should show warning alert", () => {
+				const { wrapper } = setup();
+				const warningAlert = wrapper.findComponent(WarningAlert);
 
-	describe("when task is shared", () => {
-		const setup = () => {
-			const shareModuleMock = createModuleMocks(ShareModule, {
-				getIsShareModalOpen: true,
-				getParentType: ShareTokenBodyParamsParentTypeEnum.Tasks,
-				createShareUrl: vi.fn(),
-				resetShareFlow: vi.fn(),
+				expect(warningAlert.exists()).toBe(true);
 			});
+		});
 
-			const wrapper = mount(ShareModal, {
-				global: {
-					plugins: [createTestingVuetify(), createTestingI18n()],
-					provide: {
-						[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+		describe("when task is shared", () => {
+			const setup = () => {
+				const shareModuleMock = createModuleMocks(ShareModule, {
+					getIsShareModalOpen: true,
+					getParentType: ShareTokenBodyParamsParentTypeEnum.Tasks,
+					createShareUrl: vi.fn(),
+					resetShareFlow: vi.fn(),
+				});
+
+				const wrapper = mount(ShareModal, {
+					global: {
+						plugins: [createTestingVuetify(), createTestingI18n()],
+						provide: {
+							[SHARE_MODULE_KEY.valueOf()]: shareModuleMock,
+						},
+						stubs: { UseFocusTrap: true },
 					},
-				},
-				props: {
-					type: ShareTokenBodyParamsParentTypeEnum.Tasks,
-				},
-			});
+					props: {
+						type: ShareTokenBodyParamsParentTypeEnum.Tasks,
+					},
+				});
 
-			return {
-				wrapper,
+				return {
+					wrapper,
+				};
 			};
-		};
 
-		it("should not show copyright and privacy info alert", () => {
-			const { wrapper } = setup();
-			const infoAlert = wrapper.findComponent(InfoAlert);
+			it("should not show copyright and privacy info alert", () => {
+				const { wrapper } = setup();
+				const infoAlert = wrapper.findComponent(InfoAlert);
 
-			expect(infoAlert.exists()).toBe(false);
-		});
+				expect(infoAlert.exists()).toBe(false);
+			});
 
-		it("should not show warning alert", () => {
-			const { wrapper } = setup();
-			const warningAlert = wrapper.findComponent(WarningAlert);
+			it("should not show warning alert", () => {
+				const { wrapper } = setup();
+				const warningAlert = wrapper.findComponent(WarningAlert);
 
-			expect(warningAlert.exists()).toBe(false);
+				expect(warningAlert.exists()).toBe(false);
+			});
 		});
 	});
 });
diff --git a/src/components/share/ShareModal.vue b/src/components/share/ShareModal.vue
index 2dae48dd7d..68c69b3fc6 100644
--- a/src/components/share/ShareModal.vue
+++ b/src/components/share/ShareModal.vue
@@ -1,81 +1,59 @@
 <template>
-	<v-custom-dialog
-		:is-open="isOpen"
-		data-testid="share-dialog"
-		:size="480"
-		has-buttons
-		:buttons="isOpen ? actionButtons : []"
-		@dialog-closed="onCloseDialog"
-		@next="onNext()"
-	>
-		<template #title>
-			<h2 class="mt-2 text-break">
-				{{ modalTitle }}
-			</h2>
-		</template>
-
-		<template #content>
-			<!--Fade-out animation ensures that the dialog shows the last visible step while closing-->
-			<v-fade-transition>
-				<div v-if="step === 'firstStep' && isOpen">
-					<p data-testid="share-options-info-text">
-						{{ t(`components.molecules.share.${type}.options.infoText`) }}
-					</p>
-					<InfoAlert v-if="showAlertInfo" class="mb-4">
-						{{ t("components.molecules.share.checkPrivacyAndCopyright") }}
-					</InfoAlert>
-					<WarningAlert v-if="showAlertInfo">
-						<div data-testid="share-options-table-header">
-							{{ t("components.molecules.share.options.tableHeader.InfoText") }}
-							<ul class="ml-6">
-								<li v-if="showRoomInfo" data-testid="share-options-room-memberships-data-text">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.roomMembershipsData") }}
-								</li>
-								<li v-if="showCourseInfo">
-									{{ t("components.molecules.copyResult.membersAndPermissions") }}
-								</li>
-								<li v-if="showCourseInfo || showLessonInfo">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.geogebra") }}
-								</li>
-								<li v-if="showCourseInfo || showRoomInfo || showBoardInfo || showLessonInfo">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.etherpad") }}
-								</li>
-								<li v-if="showCourseInfo || showRoomInfo || showBoardInfo">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.whiteboard") }}
-								</li>
-								<li
-									v-if="showCourseInfo || showRoomInfo || showBoardInfo"
-									data-testid="share-modal-external-tools-info"
-								>
-									{{ t("components.molecules.shareImport.options.ctlTools.infoText.unavailable") }}
-								</li>
-								<li
-									v-if="showCourseInfo || showRoomInfo || showBoardInfo"
-									data-testid="share-modal-external-tools-protected-parameter-info"
-								>
-									{{ t("components.molecules.shareImport.options.ctlTools.infoText.protected") }}
-								</li>
-								<li v-if="showCourseInfo" data-testid="share-modal-coursefiles-info">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.courseFiles") }}
-								</li>
-								<li v-if="showCourseInfo">
-									{{ t("components.molecules.shareImport.options.restrictions.infoText.courseGroups") }}
-								</li>
-							</ul>
-						</div>
-					</WarningAlert>
-					<share-modal-options-form :type="type" @share-options-change="onShareOptionsChange" />
-				</div>
-				<div v-if="step === 'secondStep' && isOpen">
-					<share-modal-result :share-url="shareUrl" :type="type" @done="onDone" @copied="onCopy" />
-				</div>
-			</v-fade-transition>
-		</template>
-	</v-custom-dialog>
+	<v-dialog v-model="isOpen" data-testid="share-dialog" max-width="480" @after-leave="onCleanUp">
+		<v-card data-testid="copy-info-dialog">
+			<UseFocusTrap>
+				<v-card-title>
+					<h2 class="mt-2 text-break">
+						{{ modalTitle }}
+					</h2>
+				</v-card-title>
+				<v-card-text class="pt-2 px-6">
+					<div v-if="step === 'firstStep'">
+						<p data-testid="share-options-info-text">
+							{{ t(`components.molecules.share.${type}.options.infoText`) }}
+						</p>
+						<InfoAlert v-if="showAlertInfo" class="mb-4">
+							{{ t("components.molecules.share.checkPrivacyAndCopyright") }}
+						</InfoAlert>
+						<WarningAlert v-if="showAlertInfo">
+							<div data-testid="share-options-table-header">
+								{{ t("components.molecules.share.options.tableHeader.InfoText") }}
+								<ul class="ml-6">
+									<li v-for="bulletPoint in listItems" :key="bulletPoint.translation" :data-testid="bulletPoint.testId">
+										{{ t(bulletPoint.translation) }}
+									</li>
+								</ul>
+							</div>
+						</WarningAlert>
+						<share-modal-options-form :type="type" @share-options-change="onShareOptionsChange" />
+					</div>
+
+					<div v-else-if="step === 'secondStep'">
+						<share-modal-result :share-url="shareUrl" :type="type" @done="onCloseDialogOrDone" @copied="onCopy" />
+					</div>
+				</v-card-text>
+				<v-card-actions class="px-6 pb-4">
+					<v-spacer />
+					<template v-if="step === 'firstStep'">
+						<v-btn variant="text" @click="onCloseDialogOrDone">
+							{{ t("common.actions.cancel") }}
+						</v-btn>
+						<v-btn variant="flat" color="primary" @click="onNext">
+							{{ t("common.actions.continue") }}
+						</v-btn>
+					</template>
+					<template v-else-if="step === 'secondStep'">
+						<v-btn variant="flat" color="primary" @click="onCloseDialogOrDone">
+							{{ t("common.labels.close") }}
+						</v-btn>
+					</template>
+				</v-card-actions>
+			</UseFocusTrap>
+		</v-card>
+	</v-dialog>
 </template>
 
 <script setup lang="ts">
-import VCustomDialog from "@/components/organisms/vCustomDialog.vue";
 import ShareModalOptionsForm from "@/components/share/ShareModalOptionsForm.vue";
 import ShareModalResult from "@/components/share/ShareModalResult.vue";
 import { ShareTokenBodyParamsParentTypeEnum } from "@/serverApi/v3/api";
@@ -83,11 +61,10 @@ import { ShareOptions } from "@/store/share";
 import { injectStrict, SHARE_MODULE_KEY } from "@/utils/inject";
 import { notifySuccess } from "@data-app";
 import { InfoAlert, WarningAlert } from "@ui-alert";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 import { computed, PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-type VDialogButtonActions = "back" | "edit" | "cancel" | "confirm" | "close" | "next";
-
 const props = defineProps({
 	type: {
 		type: String as PropType<ShareTokenBodyParamsParentTypeEnum>,
@@ -97,65 +74,100 @@ const props = defineProps({
 
 const { t } = useI18n();
 const shareModule = injectStrict(SHARE_MODULE_KEY);
-const isOpen = computed({
-	get: () => shareModule.getIsShareModalOpen && shareModule.getParentType === props.type,
-	set: () => shareModule.resetShareFlow(),
-});
+const isOpen = computed(() => shareModule.getIsShareModalOpen && shareModule.getParentType === props.type);
 
 type ShareModalStep = "firstStep" | "secondStep";
 
-const step = computed<ShareModalStep>(() => (shareModule.getShareUrl === undefined ? "firstStep" : "secondStep"));
-
-const modalOptions: Record<ShareModalStep, { title: string; actionButtons: VDialogButtonActions[] }> = {
-	firstStep: {
-		title: t("components.molecules.share.options.title"),
-		actionButtons: ["cancel", "next"],
-	},
-	secondStep: {
-		title: t("components.molecules.share.result.title"),
-		actionButtons: ["close"],
-	},
-};
-
+const step = ref<ShareModalStep>("firstStep");
 const shareUrl = computed(() => shareModule.getShareUrl ?? "");
-
-const actionButtons = computed(() => modalOptions[step.value].actionButtons ?? []);
-
 const shareOptions = ref<ShareOptions>();
 
-const modalTitle = computed(() => modalOptions[step.value].title ?? "");
+const modalTitle = computed(() =>
+	step.value === "firstStep"
+		? t("components.molecules.share.options.title")
+		: t("components.molecules.share.result.title")
+);
 
 const onShareOptionsChange = (newValue: ShareOptions) => {
-	shareOptions.value = newValue;
+	shareOptions.value = {
+		hasExpiryDate: newValue.hasExpiryDate,
+		isSchoolInternal: newValue.isSchoolInternal,
+	};
 };
-const onCloseDialog = () => {
+
+const onCloseDialogOrDone = () => {
 	shareModule.resetShareFlow();
 };
+
+const onCleanUp = () => {
+	step.value = "firstStep";
+	shareModule.resetShareFlow();
+};
+
 const onNext = () => {
+	// shareModule.createShareUrl({ isSchoolInternal: false, hasExpiryDate: false });
+	// but why is there no value available here yet?
 	if (shareOptions.value) {
 		shareModule.createShareUrl(shareOptions.value);
+		step.value = "secondStep";
 	}
 };
-const onDone = () => {
-	shareModule.resetShareFlow();
-};
+
 const onCopy = () => {
 	notifySuccess(t("common.words.copiedToClipboard"));
 };
 
-const showAlertInfo = computed(
-	() =>
-		props.type === ShareTokenBodyParamsParentTypeEnum.Courses ||
-		props.type === ShareTokenBodyParamsParentTypeEnum.ColumnBoard ||
-		props.type === ShareTokenBodyParamsParentTypeEnum.Lessons ||
-		props.type === ShareTokenBodyParamsParentTypeEnum.Room
+const showAlertInfo = computed(() =>
+	[
+		ShareTokenBodyParamsParentTypeEnum.Courses,
+		ShareTokenBodyParamsParentTypeEnum.ColumnBoard,
+		ShareTokenBodyParamsParentTypeEnum.Lessons,
+		ShareTokenBodyParamsParentTypeEnum.Room,
+	].includes(props.type)
 );
 
-const showCourseInfo = computed(() => props.type === ShareTokenBodyParamsParentTypeEnum.Courses);
-
-const showBoardInfo = computed(() => props.type === ShareTokenBodyParamsParentTypeEnum.ColumnBoard);
-
-const showLessonInfo = computed(() => props.type === ShareTokenBodyParamsParentTypeEnum.Lessons);
-
-const showRoomInfo = computed(() => props.type === ShareTokenBodyParamsParentTypeEnum.Room);
+const listItems = computed(() =>
+	[
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.roomMembershipsData",
+			type: ["room"],
+			testId: "share-options-room-memberships-data-text",
+		},
+		{
+			translation: "components.molecules.copyResult.membersAndPermissions",
+			type: ["courses"],
+		},
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.geogebra",
+			type: ["courses", "lessons"],
+		},
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.etherpad",
+			type: ["courses", "room", "columnBoard", "lessons"],
+		},
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.whiteboard",
+			type: ["courses", "room", "columnBoard"],
+		},
+		{
+			translation: "components.molecules.shareImport.options.ctlTools.infoText.unavailable",
+			type: ["courses", "room", "columnBoard"],
+			testId: "share-modal-external-tools-info",
+		},
+		{
+			translation: "components.molecules.shareImport.options.ctlTools.infoText.protected",
+			type: ["courses", "room", "columnBoard"],
+			testId: "share-modal-external-tools-protected-parameter-info",
+		},
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.courseFiles",
+			type: ["courses"],
+			testId: "share-modal-coursefiles-info",
+		},
+		{
+			translation: "components.molecules.shareImport.options.restrictions.infoText.courseGroups",
+			type: ["courses"],
+		},
+	].filter(({ type }) => type.includes(props.type))
+);
 </script>
diff --git a/src/modules/feature/room/RoomCopyFlow.unit.ts b/src/modules/feature/room/RoomCopyFlow.unit.ts
index 6d819da42f..ac9142e4c3 100644
--- a/src/modules/feature/room/RoomCopyFlow.unit.ts
+++ b/src/modules/feature/room/RoomCopyFlow.unit.ts
@@ -51,6 +51,7 @@ describe("@feature-room/RoomCopyFlow", () => {
 				provide: {
 					["loadingStateModule"]: loadingStateModuleMock,
 				},
+				stubs: { UseFocusTrap: true },
 			},
 			props: {
 				room,
diff --git a/src/modules/feature/room/RoomCopyFlow.vue b/src/modules/feature/room/RoomCopyFlow.vue
index e94758973a..6cf7ee63ad 100644
--- a/src/modules/feature/room/RoomCopyFlow.vue
+++ b/src/modules/feature/room/RoomCopyFlow.vue
@@ -1,5 +1,10 @@
 <template>
-	<RoomCopyInfoDialog v-if="isRoomCopyInfoDialogOpen" @copy:cancel="onCancelCopy" @copy:confirm="onConfirmCopy" />
+	<RoomCopyInfoDialog
+		v-if="isRoomCopyInfoDialogOpen"
+		@copy:cancel="onCancelCopy"
+		@copy:confirm="onConfirmCopy"
+		@copy:close="onClose"
+	/>
 </template>
 
 <script setup lang="ts">
@@ -37,14 +42,18 @@ onMounted(() => {
 	isLoadingDialogOpen.value = false;
 });
 
-const onCancelCopy = () => {
+const onClose = () => {
 	isRoomCopyInfoDialogOpen.value = false;
+};
+
+const onCancelCopy = () => {
+	onClose();
 	emit("copy:cancel");
 	emit("copy:ended");
 };
 
 const onConfirmCopy = async () => {
-	isRoomCopyInfoDialogOpen.value = false;
+	onClose();
 	isLoadingDialogOpen.value = true;
 
 	try {
diff --git a/src/modules/feature/room/RoomCopyInfoDialog.unit.ts b/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
index b9b9d184c0..9b6fef0f25 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
+++ b/src/modules/feature/room/RoomCopyInfoDialog.unit.ts
@@ -6,6 +6,8 @@ describe("@feature-room/RoomCopyInfoDialog", () => {
 		const wrapper = mount(RoomCopyInfoDialog, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
+				stubs: { UseFocusTrap: true }, // unfortuantely it is not as straightward to test the focus trap
+				renderStubDefaultSlot: true,
 			},
 		});
 
diff --git a/src/modules/feature/room/RoomCopyInfoDialog.vue b/src/modules/feature/room/RoomCopyInfoDialog.vue
index e95c151bc8..f913dc22b6 100644
--- a/src/modules/feature/room/RoomCopyInfoDialog.vue
+++ b/src/modules/feature/room/RoomCopyInfoDialog.vue
@@ -1,52 +1,45 @@
 <template>
-	<v-dialog v-model="isOpen" max-width="520">
+	<v-dialog v-model="isOpen" max-width="520" @after-leave="$emit('copy:close')">
 		<v-card data-testid="copy-info-dialog">
-			<v-card-title class="text-h2 text-break px-6 pt-4" data-testid="copy-info-dialog-title">
-				{{ $t("feature-room.CopyInfoDialog.title") }}
-			</v-card-title>
-
-			<v-card-text class="pt-2">
-				<p>
-					{{ $t("feature-room.CopyInfoDialog.text.nextStep") }}
-				</p>
-				<InfoAlert class="mb-4">
-					{{ $t("components.molecules.share.checkPrivacyAndCopyright") }}
-				</InfoAlert>
-				<WarningAlert>
-					<p class="mb-1">
-						{{ t("feature-room.CopyInfoDialog.text.alert.followingContent") }}
+			<UseFocusTrap>
+				<v-card-title class="text-h2 text-break px-6 pt-4" data-testid="copy-info-dialog-title">
+					{{ t("feature-room.CopyInfoDialog.title") }}
+				</v-card-title>
+				<v-card-text class="pt-2 px-6">
+					<p>
+						{{ t("feature-room.CopyInfoDialog.text.nextStep") }}
 					</p>
-					<ul class="ml-6">
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.membersPermissions") }}
-						</li>
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.Etherpad") }}
-						</li>
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.whiteboard") }}
-						</li>
-						<li>
-							{{ t("feature-room.CopyInfoDialog.text.alert.protectedSettings") }}
-						</li>
-					</ul>
-				</WarningAlert>
-			</v-card-text>
-			<v-card-actions class="px-6 pb-4">
-				<v-spacer />
-				<v-btn variant="text" data-testid="copy-info-dialog-cancel" @click="$emit('copy:cancel')">
-					{{ $t("common.actions.cancel") }}
-				</v-btn>
-				<v-btn variant="flat" color="primary" data-testid="copy-info-dialog-confirm" @click="$emit('copy:confirm')">
-					{{ $t("common.actions.duplicate") }}
-				</v-btn>
-			</v-card-actions>
+					<InfoAlert class="mb-4">
+						{{ t("components.molecules.share.checkPrivacyAndCopyright") }}
+					</InfoAlert>
+					<WarningAlert>
+						<p class="mb-1">
+							{{ t("feature-room.CopyInfoDialog.text.alert.followingContent") }}
+						</p>
+						<ul class="ml-6">
+							<li v-for="bulletPoint in infoListItems" :key="bulletPoint">
+								{{ bulletPoint }}
+							</li>
+						</ul>
+					</WarningAlert>
+				</v-card-text>
+				<v-card-actions class="px-6 pb-4">
+					<v-spacer />
+					<v-btn variant="text" data-testid="copy-info-dialog-cancel" @click="$emit('copy:cancel')">
+						{{ t("common.actions.cancel") }}
+					</v-btn>
+					<v-btn variant="flat" color="primary" data-testid="copy-info-dialog-confirm" @click="$emit('copy:confirm')">
+						{{ t("common.actions.duplicate") }}
+					</v-btn>
+				</v-card-actions>
+			</UseFocusTrap>
 		</v-card>
 	</v-dialog>
 </template>
 
 <script setup lang="ts">
 import { InfoAlert, WarningAlert } from "@ui-alert";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
@@ -54,5 +47,12 @@ const { t } = useI18n();
 
 const isOpen = ref(true);
 
-defineEmits(["copy:cancel", "copy:confirm"]);
+const infoListItems = [
+	"feature-room.CopyInfoDialog.text.alert.membersPermissions",
+	"feature-room.CopyInfoDialog.text.alert.Etherpad",
+	"feature-room.CopyInfoDialog.text.alert.whiteboard",
+	"feature-room.CopyInfoDialog.text.alert.protectedSettings",
+].map(t);
+
+defineEmits(["copy:cancel", "copy:confirm", "copy:close"]);
 </script>
diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts b/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
index 2eaf015330..3f22280938 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.unit.ts
@@ -22,7 +22,6 @@ describe("@ui-room-details/SelectBoardLayoutDialog", () => {
 
 	it("should be rendered correctly", async () => {
 		const { wrapper } = setup();
-
 		expect(wrapper.exists()).toBe(true);
 	});
 
diff --git a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
index b9fd51f38c..3935d1db9c 100644
--- a/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
+++ b/src/modules/ui/room-details/SelectBoardLayoutDialog.vue
@@ -3,7 +3,7 @@
 		<UseFocusTrap :options="{ immediate: true }">
 			<VCard data-testid="board-layout-dialog">
 				<VCardTitle class="text-h2 text-break px-6 pt-4" data-testid="board-layout-dialog-title">
-					{{ $t("pages.room.dialog.boardLayout.title") }}
+					{{ t("pages.room.dialog.boardLayout.title") }}
 				</VCardTitle>
 				<VCardText class="d-flex flex-row flex-wrap align-center justify-space-around pt-4 pb-6">
 					<ExtendedIconBtn
@@ -18,7 +18,7 @@
 				</VCardText>
 				<VCardActions class="mb-2 px-6 justify-end">
 					<VBtn data-testid="dialog-close" variant="outlined" @click="$emit('update:modelValue', false)">
-						{{ $t("common.actions.cancel") }}
+						{{ t("common.actions.cancel") }}
 					</VBtn>
 				</VCardActions>
 			</VCard>
diff --git a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
index 0d0cb2cf10..72373904fa 100644
--- a/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
+++ b/src/pages/course-rooms/CourseRoomDetails.page.unit.ts
@@ -30,7 +30,7 @@ import { SpeedDialMenu, SpeedDialMenuAction } from "@ui-speed-dial-menu";
 import { mount } from "@vue/test-utils";
 import { setActivePinia } from "pinia";
 import { nextTick } from "vue";
-import { VBtn } from "vuetify/lib/components/index";
+import { VBtn, VDialog } from "vuetify/lib/components/index";
 
 vi.mock("./tools/RoomExternalToolsOverview.vue");
 
@@ -510,9 +510,9 @@ describe("@/pages/CourseRoomDetails.page.vue", () => {
 			const modalView = wrapper.findComponent({
 				name: "share-modal",
 			});
-			const shareDialog = modalView.findComponent({ name: "v-custom-dialog" });
+			const shareDialog = modalView.findComponent(VDialog);
 
-			expect(shareDialog.props("isOpen")).toBe(true);
+			expect(shareDialog.isVisible()).toBeTruthy();
 		});
 	});