diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,10 +7,10 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '20d3b672',
-    'core.pkg.js' => '0c88e7f6',
+    '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',
@@ -34,7 +34,7 @@
     'rsrc/css/aphront/typeahead.css' => '0e403212',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '1e655982',
-    'rsrc/css/application/base/main-menu-view.css' => 'cfa2ec0f',
+    'rsrc/css/application/base/main-menu-view.css' => '58db7ad2',
     'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
     'rsrc/css/application/base/standard-page-view.css' => 'd2a6518d',
@@ -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',
@@ -105,7 +105,7 @@
     'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => 'd17c2099',
+    'rsrc/css/core/core.css' => '86bfbe8c',
     'rsrc/css/core/remarkup.css' => 'bc65f3cc',
     'rsrc/css/core/syntax.css' => '56c1ba38',
     'rsrc/css/core/z-index.css' => '2db67397',
@@ -437,7 +437,7 @@
     'rsrc/js/application/uiexample/busy-example.js' => '60479091',
     'rsrc/js/application/uiexample/gesture-example.js' => '558829c2',
     'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5',
-    'rsrc/js/core/Busy.js' => 'f13d6d1d',
+    'rsrc/js/core/Busy.js' => '6453c869',
     'rsrc/js/core/DragAndDropFileUpload.js' => '7fa4b248',
     'rsrc/js/core/DraggableList.js' => 'a16ec1c6',
     'rsrc/js/core/FileUpload.js' => '477359c8',
@@ -521,7 +521,7 @@
     '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',
@@ -712,10 +712,10 @@
     'people-profile-css' => '25970776',
     'phabricator-action-list-view-css' => '9ee9910a',
     'phabricator-application-launch-view-css' => '16ca323f',
-    'phabricator-busy' => 'f13d6d1d',
+    'phabricator-busy' => '6453c869',
     'phabricator-chatlog-css' => '852140ff',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => 'd17c2099',
+    'phabricator-core-css' => '86bfbe8c',
     'phabricator-countdown-css' => '86b7b0a0',
     'phabricator-dashboard-css' => '17937d22',
     'phabricator-drag-and-drop-file-upload' => '7fa4b248',
@@ -729,7 +729,7 @@
     'phabricator-hovercard-view-css' => '893f4783',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
-    'phabricator-main-menu-view' => 'cfa2ec0f',
+    'phabricator-main-menu-view' => '58db7ad2',
     'phabricator-nav-view-css' => '7aeaf435',
     'phabricator-notification' => '0c6946e7',
     'phabricator-notification-css' => '9c279160',
@@ -1252,6 +1252,11 @@
       'javelin-install',
       'javelin-util',
     ),
+    '6453c869' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-fx',
+    ),
     '6882e80a' => array(
       'javelin-dom',
     ),
@@ -1824,6 +1829,9 @@
       'javelin-dom',
       'phabricator-prefab',
     ),
+    'e19cfd6e' => array(
+      'phui-inline-comment-view-css',
+    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1910,11 +1918,6 @@
       'javelin-install',
       'javelin-util',
     ),
-    'f13d6d1d' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-fx',
-    ),
     'f24f3253' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -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 {