diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'core.pkg.css' => '2ff29d1d',
     'core.pkg.js' => 'c5888f3d',
     'darkconsole.pkg.js' => '8ab24e01',
-    'differential.pkg.css' => '571b1cc1',
+    'differential.pkg.css' => '3500921f',
     'differential.pkg.js' => 'c0506961',
     'diffusion.pkg.css' => '591664fa',
     'diffusion.pkg.js' => 'bfc0737b',
@@ -45,7 +45,7 @@
     'rsrc/css/application/config/setup-issue.css' => '22270af2',
     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
     'rsrc/css/application/conpherence/durable-column.css' => 'e2011d85',
-    'rsrc/css/application/conpherence/menu.css' => '9b37a261',
+    'rsrc/css/application/conpherence/menu.css' => '2c1c727c',
     'rsrc/css/application/conpherence/message-pane.css' => '44154798',
     'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
     'rsrc/css/application/conpherence/update.css' => '1099a660',
@@ -55,7 +55,7 @@
     'rsrc/css/application/dashboard/dashboard.css' => '17937d22',
     'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'f36406b1',
+    'rsrc/css/application/differential/changeset-view.css' => 'e19cfd6e',
     'rsrc/css/application/differential/core.css' => '7ac3cabc',
     'rsrc/css/application/differential/phui-inline-comment.css' => '7277be53',
     'rsrc/css/application/differential/results-table.css' => '181aa9d9',
@@ -515,13 +515,13 @@
     'config-options-css' => '7fedf08b',
     'config-welcome-css' => '6abd79be',
     'conpherence-durable-column-view' => 'e2011d85',
-    'conpherence-menu-css' => '9b37a261',
+    'conpherence-menu-css' => '2c1c727c',
     'conpherence-message-pane-css' => '44154798',
     'conpherence-notification-css' => '04a6e10a',
     'conpherence-thread-manager' => 'bb928342',
     'conpherence-update-css' => '1099a660',
     'conpherence-widget-pane-css' => '1979ee8c',
-    'differential-changeset-view-css' => 'f36406b1',
+    'differential-changeset-view-css' => 'e19cfd6e',
     'differential-core-view-css' => '7ac3cabc',
     'differential-inline-comment-editor' => '2529c82d',
     'differential-results-table-css' => '181aa9d9',
@@ -1829,6 +1829,9 @@
       'javelin-dom',
       'phabricator-prefab',
     ),
+    'e19cfd6e' => array(
+      'phui-inline-comment-view-css',
+    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1923,9 +1926,6 @@
       'multirow-row-manager',
       'javelin-json',
     ),
-    'f36406b1' => array(
-      'phui-inline-comment-view-css',
-    ),
     'f36e01af' => array(
       'javelin-behavior',
       'javelin-behavior-device',
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -8,6 +8,10 @@
   margin: 0;
   padding-top: 32px;
   overflow-x: auto;
+
+  /* Fixes what seems to be a layout bug in Firefox which causes scrollbars,
+     to appear unpredictably, see discussion in T7690. */
+  overflow-y: hidden;
 }
 
 .device-phone .differential-changeset {