From dfb4bdeb24f8bf553796db6dba9daf53ceeed08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <kayla@tree.camp>
Date: Thu, 11 Sep 2025 21:30:16 +0000
Subject: [PATCH 1/2] Revert "fix: prevent new workspace page from scrolling
 past the bottom of the screen (#19705)"

This reverts commit a78d65c8b96667527a703d6a7c4d7707d0101cd4.
---
 .../CreateWorkspacePageViewExperimental.tsx               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
index 89920b35007da..cf1fd1746ce44 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -340,7 +340,7 @@ export const CreateWorkspacePageViewExperimental: FC<
 	});
 
 	return (
-		<div className="flex flex-col flex-1 min-h-0 pb-12">
+		<>
 			<div className="sticky top-5 ml-10">
 				<button
 					onClick={onCancel}
@@ -351,7 +351,7 @@ export const CreateWorkspacePageViewExperimental: FC<
 					Go back
 				</button>
 			</div>
-			<div className="flex flex-col flex-1 min-h-0 gap-6 max-w-screen-md mx-auto">
+			<div className="flex flex-col gap-6 max-w-screen-md mx-auto">
 				<header className="flex flex-col items-start gap-3 mt-10">
 					<div className="flex items-center gap-2 justify-between w-full">
 						<span className="flex items-center gap-2">
@@ -412,7 +412,7 @@ export const CreateWorkspacePageViewExperimental: FC<
 				<form
 					onSubmit={form.handleSubmit}
 					aria-label="Create workspace form"
-					className="relative flex flex-col flex-1 min-h-0 overflow-y-auto gap-10 w-full border border-border-default border-solid rounded-lg p-6"
+					className="flex flex-col gap-10 w-full border border-border-default border-solid rounded-lg p-6"
 				>
 					{Boolean(error) && <ErrorAlert error={error} />}
 
@@ -683,6 +683,6 @@ export const CreateWorkspacePageViewExperimental: FC<
 					</div>
 				</form>
 			</div>
-		</div>
+		</>
 	);
 };

From 4d7c9357bcd2172332c7ea62f1fb346f265e54fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <kayla@tree.camp>
Date: Thu, 11 Sep 2025 22:53:17 +0000
Subject: [PATCH 2/2] fix: prevent unruly stacking contexts from breaking
 scrolling

---
 site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx | 2 ++
 site/src/modules/dashboard/DashboardLayout.tsx                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx b/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
index 8ff83f2a4583a..c1e518c3a3c21 100644
--- a/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
+++ b/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
@@ -706,3 +706,5 @@ export const MultiSelectCombobox = forwardRef<
 		);
 	},
 );
+
+MultiSelectCombobox.displayName = "MultiSelectCombobox";
diff --git a/site/src/modules/dashboard/DashboardLayout.tsx b/site/src/modules/dashboard/DashboardLayout.tsx
index 1b3c5945b4c0d..8b59078cd390a 100644
--- a/site/src/modules/dashboard/DashboardLayout.tsx
+++ b/site/src/modules/dashboard/DashboardLayout.tsx
@@ -26,7 +26,7 @@ export const DashboardLayout: FC = () => {
 			<div className="flex flex-col h-screen justify-between">
 				<Navbar />
 
-				<div className="flex flex-col flex-1 min-h-0 overflow-y-auto">
+				<div className="relative flex flex-col flex-1 min-h-0 overflow-y-auto">
 					<Suspense fallback={<Loader />}>
 						<Outlet />
 					</Suspense>