diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index 38beef91..c3a67f8b 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -92,8 +92,8 @@
     {{ end }}
 
     {{ block "contentAfterLayout" . }}
-    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-      <div class="col-span-1 md:col-span-2">
+    <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
         {{ block "contentAfterLeft" . }} {{ end }}
       </div>
       <main class="col-span-1 md:col-span-10">
@@ -118,7 +118,7 @@
   <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
-  <div class="sticky top-0 mt-4">
+  <div class="sticky top-0 flex-grow max-h-screen">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html
index a23ad38c..384e0f52 100644
--- a/appview/pages/templates/repo/compare/compare.html
+++ b/appview/pages/templates/repo/compare/compare.html
@@ -23,8 +23,8 @@
     {{ end }}
 
     {{ block "contentAfterLayout" . }}
-    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-      <div class="col-span-1 md:col-span-2">
+    <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
         {{ block "contentAfterLeft" . }} {{ end }}
       </div>
       <main class="col-span-1 md:col-span-10">
@@ -49,7 +49,7 @@
   <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
-  <div class="sticky top-0 mt-4">
+  <div class="sticky top-0 flex-grow max-h-screen">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/fragments/diffChangedFiles.html b/appview/pages/templates/repo/fragments/diffChangedFiles.html
index b713204a..34c43029 100644
--- a/appview/pages/templates/repo/fragments/diffChangedFiles.html
+++ b/appview/pages/templates/repo/fragments/diffChangedFiles.html
@@ -1,7 +1,7 @@
 {{ define "repo/fragments/diffChangedFiles" }}
   {{ $stat := .Stat }}
   {{ $fileTree := fileTree .ChangedFiles }}
-  <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto md:min-h-screen rounded bg-white dark:bg-gray-800 drop-shadow-sm">
+  <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm">
     <div class="diff-stat">
       <div class="flex gap-2 items-center">
         <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong>
diff --git a/appview/pages/templates/repo/fragments/interdiffFiles.html b/appview/pages/templates/repo/fragments/interdiffFiles.html
index 0825d236..26d3d995 100644
--- a/appview/pages/templates/repo/fragments/interdiffFiles.html
+++ b/appview/pages/templates/repo/fragments/interdiffFiles.html
@@ -1,6 +1,6 @@
 {{ define "repo/fragments/interdiffFiles" }}
 {{ $fileTree := fileTree .AffectedFiles }}
-<section class="mt-4 px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm md:min-h-screen text-sm">
+<section class="mt-4 px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm min-h-full text-sm">
   <div class="diff-stat">
     <div class="flex gap-2 items-center">
       <strong class="text-sm uppercase dark:text-gray-200">files</strong>
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index 78b303c1..81da1b22 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -41,8 +41,8 @@
     {{ end }}
 
     {{ block "contentAfterLayout" . }}
-    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-      <div class="col-span-1 md:col-span-2">
+    <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
         {{ block "contentAfterLeft" . }} {{ end }}
       </div>
       <main class="col-span-1 md:col-span-10">
@@ -68,7 +68,7 @@
   <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
-  <div class="sticky top-0 mt-4">
+  <div class="sticky top-0 flex-grow max-h-screen">
     {{ template "repo/fragments/interdiffFiles" .Interdiff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index cd90c43c..3769c3af 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -47,8 +47,8 @@
     {{ end }}
 
     {{ block "contentAfterLayout" . }}
-    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-      <div class="col-span-1 md:col-span-2">
+    <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
         {{ block "contentAfterLeft" . }} {{ end }}
       </div>
       <main class="col-span-1 md:col-span-10">
@@ -73,7 +73,7 @@
   <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
-  <div class="sticky top-0 mt-4">
+  <div class="sticky top-0 flex-grow max-h-screen">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}