diff --git a/src/lib/components/admin/Functions/FunctionHistory.svelte b/src/lib/components/admin/Functions/FunctionHistory.svelte
index b224166beb..09a277926d 100644
--- a/src/lib/components/admin/Functions/FunctionHistory.svelte
+++ b/src/lib/components/admin/Functions/FunctionHistory.svelte
@@ -157,7 +157,7 @@
 			<ChevronDown className="size-3" />
 		</button>
 		<div slot="content">
-			<DropdownMenu className="w-56">
+			<DropdownMenu className="w-72 max-w-[calc(100vw-2rem)]">
 				<VersionMenuItem
 					entry={production}
 					status={$i18n.t('Production')}
diff --git a/src/lib/components/common/ConfirmDialog.svelte b/src/lib/components/common/ConfirmDialog.svelte
index 957e584fed..0112523afe 100644
--- a/src/lib/components/common/ConfirmDialog.svelte
+++ b/src/lib/components/common/ConfirmDialog.svelte
@@ -41,6 +41,13 @@
 	let mounted = false;
 
 	let focusTrap: FocusTrap.FocusTrap | null = null;
+	let previousOverflow: string | null = null;
+	const restoreOverflow = () => {
+		if (previousOverflow !== null) {
+			document.body.style.overflow = previousOverflow;
+			previousOverflow = null;
+		}
+	};
 
 	const init = () => {
 		_inputValue = inputValue;
@@ -90,6 +97,7 @@
 			focusTrap.activate();
 
 			window.addEventListener('keydown', handleKeyDown);
+			previousOverflow = document.body.style.overflow;
 			document.body.style.overflow = 'hidden';
 		} else if (modalElement) {
 			focusTrap.deactivate();
@@ -97,12 +105,13 @@
 			window.removeEventListener('keydown', handleKeyDown);
 			document.body.removeChild(modalElement);
 
-			document.body.style.overflow = 'unset';
+			restoreOverflow();
 		}
 	}
 
 	onDestroy(() => {
 		show = false;
+		restoreOverflow();
 		window.removeEventListener('keydown', handleKeyDown);
 		if (focusTrap) {
 			focusTrap.deactivate();