diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
index be6d1c62fd..007c0fc9f1 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
@@ -138,7 +138,6 @@ limitations under the License.
         box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
         display: block;
         margin: .25em 0 1em;
-        overflow: auto;
       }
       @media screen and (max-width: 50em) {
         .row[selected] {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
index f995b22496..7ae5c34461 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
@@ -31,26 +31,17 @@ limitations under the License.
     <style>
       :host {
         background-color: var(--view-background-color);
-        display: flex;
-        flex-direction: column;
-        height: 100%;
+        display: block;
       }
-      .titleHeader,
-      .patchRangeHeader {
+      header,
+      .subHeader {
         align-items: center;
         display: flex;
         justify-content: space-between;
       }
-      .titleHeader {
+      header {
         padding: .75em var(--default-horizontal-margin);
       }
-      .patchRangeHeader {
-        margin: 0 var(--default-horizontal-margin) .75em;
-      }
-      #diff {
-        flex: 1;
-        overflow: auto;
-      }
       .navLink:not([href]) {
         color: #999;
       }
@@ -115,6 +106,9 @@ limitations under the License.
         padding: 0 var(--default-horizontal-margin) 1em;
         color: #666;
       }
+      .subHeader {
+        margin: 0 var(--default-horizontal-margin) .75em;
+      }
       .prefsButton {
         text-align: right;
       }
@@ -141,61 +135,59 @@ limitations under the License.
       }
     </style>
     <header>
-      <div class="titleHeader">
-        <h3>
-          <a href$="[[_computeChangePath(_changeNum, _patchRange.*, _change.revisions)]]">
-            [[_changeNum]]</a><span>:</span>
-          <span>[[_change.subject]]</span>
-          <span class="dash">—</span>
-          <input
-              id="reviewed"
-              class="reviewed"
-              type="checkbox"
-              on-change="_handleReviewedChange"
-              hidden$="[[!_loggedIn]]"
-              hidden>
-          <div class="jumpToFileContainer">
-            <gr-button link class="dropdown-trigger" id="trigger" on-tap="_showDropdownTapHandler">
-              <span>[[_computeFileDisplayName(_path)]]</span>
-              <span class="downArrow">&#9660;</span>
-            </gr-button>
-            <iron-dropdown id="dropdown" vertical-align="top" vertical-offset="25">
-              <div class="dropdown-content">
-                <template
-                    is="dom-repeat"
-                    items="[[_fileList]]"
-                    as="path"
-                    initial-count="75">
-                  <a href$="[[_computeDiffURL(_changeNum, _patchRange.*, path)]]"
-                     selected$="[[_computeFileSelected(path, _path)]]"
-                     data-key-nav$="[[_computeKeyNav(path, _path, _fileList)]]"
-                     on-tap="_handleFileTap">[[_computeFileDisplayName(path)]]</a>
-                </template>
-              </div>
-            </iron-dropdown>
-          </div>
-          <div class="mobileJumpToFileContainer">
-            <select on-change="_handleMobileSelectChange">
-              <template is="dom-repeat" items="[[_fileList]]" as="path">
-                <option
-                    value$="[[path]]"
-                    selected$="[[_computeFileSelected(path, _path)]]">
-                  [[_computeTruncatedFileDisplayName(path)]]
-                </option>
+      <h3>
+        <a href$="[[_computeChangePath(_changeNum, _patchRange.*, _change.revisions)]]">
+          [[_changeNum]]</a><span>:</span>
+        <span>[[_change.subject]]</span>
+        <span class="dash">—</span>
+        <input id="reviewed"
+            class="reviewed"
+            type="checkbox"
+            on-change="_handleReviewedChange"
+            hidden$="[[!_loggedIn]]" hidden>
+        <div class="jumpToFileContainer">
+          <gr-button link class="dropdown-trigger" id="trigger" on-tap="_showDropdownTapHandler">
+            <span>[[_computeFileDisplayName(_path)]]</span>
+            <span class="downArrow">&#9660;</span>
+          </gr-button>
+          <iron-dropdown id="dropdown" vertical-align="top" vertical-offset="25">
+            <div class="dropdown-content">
+              <template
+                  is="dom-repeat"
+                  items="[[_fileList]]"
+                  as="path"
+                  initial-count="75">
+                <a href$="[[_computeDiffURL(_changeNum, _patchRange.*, path)]]"
+                   selected$="[[_computeFileSelected(path, _path)]]"
+                   data-key-nav$="[[_computeKeyNav(path, _path, _fileList)]]"
+                   on-tap="_handleFileTap">[[_computeFileDisplayName(path)]]</a>
               </template>
-            </select>
-          </div>
-        </h3>
-        <div>
-          <a class="navLink"
-             href$="[[_computeNavLinkURL(_path, _fileList, -1, 1)]]">Prev</a>
-          /
-          <a class="navLink"
-             href$="[[_computeNavLinkURL(_path, _fileList, 1, 1)]]">Next</a>
+            </div>
+          </iron-dropdown>
         </div>
+        <div class="mobileJumpToFileContainer">
+          <select on-change="_handleMobileSelectChange">
+            <template is="dom-repeat" items="[[_fileList]]" as="path">
+              <option
+                  value$="[[path]]"
+                  selected$="[[_computeFileSelected(path, _path)]]">
+                [[_computeTruncatedFileDisplayName(path)]]
+              </option>
+            </template>
+          </select>
+        </div>
+      </h3>
+      <div>
+        <a class="navLink"
+            href$="[[_computeNavLinkURL(_path, _fileList, -1, 1)]]">Prev</a>
+        /
+        <a class="navLink"
+            href$="[[_computeNavLinkURL(_path, _fileList, 1, 1)]]">Next</a>
       </div>
-      <div class="loading" hidden$="[[!_loading]]">Loading...</div>
-      <div class="patchRangeHeader" hidden hidden$="[[_loading]]">
+    </header>
+    <div class="loading" hidden$="[[!_loading]]">Loading...</div>
+    <div hidden$="[[_loading]]" hidden>
+      <div class="subHeader">
         <gr-patch-range-select
             path="[[_path]]"
             change-num="[[_changeNum]]"
@@ -216,38 +208,35 @@ limitations under the License.
           <span hidden$="[[_computePrefsButtonHidden(_prefs, _loggedIn)]]">
             <span
                 hidden$="[[_computeModeSelectHidden(_isImageDiff)]]">/</span>
-            <gr-button
-                link
+            <gr-button link
                 class="prefsButton"
                 on-tap="_handlePrefsTap">Preferences</gr-button>
           </span>
         </div>
-        <gr-overlay id="prefsOverlay" with-backdrop>
-          <gr-diff-preferences
-              id="diffPreferences"
-              prefs="{{_prefs}}"
-              local-prefs="{{_localPrefs}}"
-              on-save="_handlePrefsSave"
-              on-cancel="_handlePrefsCancel"></gr-diff-preferences>
-        </gr-overlay>
       </div>
-    </header>
-    <gr-diff
-        id="diff"
-        hidden
-        hidden$="[[_loading]]"
-        project="[[_change.project]]"
-        commit="[[_change.current_revision]]"
-        is-image-diff="{{_isImageDiff}}"
-        files-weblinks="{{_filesWeblinks}}"
-        change-num="[[_changeNum]]"
-        patch-range="[[_patchRange]]"
-        path="[[_path]]"
-        prefs="[[_prefs]]"
-        project-config="[[_projectConfig]]"
-        view-mode="[[_diffMode]]"
-        on-line-selected="_onLineSelected">
-    </gr-diff>
+      <gr-overlay id="prefsOverlay" with-backdrop>
+        <gr-diff-preferences
+            id="diffPreferences"
+            prefs="{{_prefs}}"
+            local-prefs="{{_localPrefs}}"
+            on-save="_handlePrefsSave"
+            on-cancel="_handlePrefsCancel"></gr-diff-preferences>
+      </gr-overlay>
+      <gr-diff
+          id="diff"
+          project="[[_change.project]]"
+          commit="[[_change.current_revision]]"
+          is-image-diff="{{_isImageDiff}}"
+          files-weblinks="{{_filesWeblinks}}"
+          change-num="[[_changeNum]]"
+          patch-range="[[_patchRange]]"
+          path="[[_path]]"
+          prefs="[[_prefs]]"
+          project-config="[[_projectConfig]]"
+          view-mode="[[_diffMode]]"
+          on-line-selected="_onLineSelected">
+      </gr-diff>
+    </div>
     <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
     <gr-storage id="storage"></gr-storage>
     <gr-diff-cursor id="cursor"></gr-diff-cursor>
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
index ca2de57056..565bfab07a 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
@@ -44,6 +44,7 @@ limitations under the License.
         border-top: 1px solid #eee;
         display: flex;
         font: 12px var(--monospace-font-family);
+        overflow-x: auto;
         will-change: transform;
       }
       table {
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index acee383cab..a403e6c72d 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -41,8 +41,8 @@ limitations under the License.
     <style>
       :host {
         display: flex;
+        min-height: 100vh;
         flex-direction: column;
-        height: 100vh;
       }
       gr-main-header,
       footer {
@@ -58,7 +58,6 @@ limitations under the License.
       main {
         flex: 1;
         position: relative;
-        overflow: scroll;
       }
       .errorView {
         align-items: center;