diff --git a/site/src/components/Form/Form.tsx b/site/src/components/Form/Form.tsx
index 5b4d4d3343..ebfab3b4a6 100644
--- a/site/src/components/Form/Form.tsx
+++ b/site/src/components/Form/Form.tsx
@@ -99,7 +99,7 @@ export const FormSection: FC<FormSectionProps> = ({
 		>
 			<div
 				className={cn(
-					"w-full shrink-0 top-6",
+					"w-full shrink-0 top-24",
 					direction === "horizontal" && "lg:sticky lg:max-w-[312px]",
 					classes.sectionInfo,
 				)}
diff --git a/site/src/modules/dashboard/DashboardLayout.tsx b/site/src/modules/dashboard/DashboardLayout.tsx
index 42d8824a59..9bc970f53d 100644
--- a/site/src/modules/dashboard/DashboardLayout.tsx
+++ b/site/src/modules/dashboard/DashboardLayout.tsx
@@ -43,7 +43,7 @@ export const DashboardLayout: FC = () => {
 					id="main-content"
 					tabIndex={-1}
 					className={cn(
-						"relative flex flex-col flex-1 min-h-0 overflow-y-auto",
+						"relative flex flex-col flex-1 min-h-0",
 						"focus:outline-none",
 					)}
 				>
diff --git a/site/src/modules/templates/TemplateFiles/TemplateFiles.tsx b/site/src/modules/templates/TemplateFiles/TemplateFiles.tsx
index f5827e29f9..b7291ab255 100644
--- a/site/src/modules/templates/TemplateFiles/TemplateFiles.tsx
+++ b/site/src/modules/templates/TemplateFiles/TemplateFiles.tsx
@@ -61,7 +61,8 @@ export const TemplateFiles: FC<TemplateFilesProps> = ({
 	return (
 		<div>
 			<div className="flex items-start gap-8">
-				<div className="sticky top-8 w-[240px] shrink-0 overflow-auto rounded-lg border border-solid border-surface-quaternary py-1">
+				{/* top-28 (112px) is a sum of nav height (72px) and TemplateLayout's LinkTabs' mb-10 (40px) */}
+				<div className="sticky top-28 w-[240px] shrink-0 overflow-auto rounded-lg border border-solid border-surface-quaternary py-1">
 					<TemplateFileTree
 						fileTree={fileTree}
 						onSelect={(path: string) => {
diff --git a/site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx b/site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx
index 7d2295b5b7..3608fc95f0 100644
--- a/site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx
+++ b/site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx
@@ -65,7 +65,7 @@ export const StarterTemplates: FC<StarterTemplatesProps> = ({
 	return (
 		<div className="flex flex-row gap-8 items-start">
 			{starterTemplatesByTag && tags && (
-				<div className="flex flex-col gap-4 w-[202px] shrink-0 sticky">
+				<div className="flex flex-col gap-4 w-[202px] shrink-0 sticky top-[88px]">
 					<h2 className="m-0 text-base font-normal text-content-primary">
 						Choose a starter template
 					</h2>
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
index d55179221b..ee75928c44 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -398,7 +398,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
 				<button
 					onClick={onCancel}
 					type="button"
-					className="flex items-center gap-2 bg-transparent border-none text-content-secondary hover:text-content-primary translate-y-12"
+					className="flex items-center gap-2 bg-transparent border-none text-content-secondary hover:text-content-primary translate-y-[68px]"
 				>
 					<ArrowLeftIcon size={20} />
 					Go back
diff --git a/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx b/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
index 007244c19b..bb11c33d9c 100644
--- a/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
+++ b/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
@@ -182,8 +182,8 @@ export const TemplateBuilderPageView: FC<TemplateBuilderPageViewProps> = ({
 					{currentStep.id === "base-infra" && <TemplateAlternatives />}
 				</div>
 
-				{/* Sidebar */}
-				<div className="w-64 shrink-0 hidden md:block sticky top-0 self-start">
+				{/* Sidebar (top position is 72px so that it can sit below nav) */}
+				<div className="w-64 shrink-0 hidden md:block sticky top-[72px] self-start">
 					<SelectionSummary
 						currentStep={currentStep.group}
 						selectedTemplate={