diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 3950de223c..fe4cb8a7f8 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@ return array(
     'conpherence.pkg.css' => '0b64e988',
     'conpherence.pkg.js' => '6249a1cf',
     'core.pkg.css' => '2f1ecc57',
-    'core.pkg.js' => 'ba34ebda',
+    'core.pkg.js' => '56f967a5',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => 'a4ba74b5',
     'differential.pkg.js' => '634399e9',
@@ -471,7 +471,7 @@ return array(
     'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5',
     'rsrc/js/core/Busy.js' => '59a7976a',
     'rsrc/js/core/DragAndDropFileUpload.js' => '58dea2fa',
-    'rsrc/js/core/DraggableList.js' => '5a13c79f',
+    'rsrc/js/core/DraggableList.js' => 'bea6e7f4',
     'rsrc/js/core/Favicon.js' => '1fe2510c',
     'rsrc/js/core/FileUpload.js' => '680ea2c8',
     'rsrc/js/core/Hovercard.js' => '1bd28176',
@@ -786,7 +786,7 @@ return array(
     'phabricator-countdown-css' => '16c52f5c',
     'phabricator-dashboard-css' => 'bc6f2127',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
-    'phabricator-draggable-list' => '5a13c79f',
+    'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
     'phabricator-favicon' => '1fe2510c',
     'phabricator-feed-css' => 'ecd4ec57',
@@ -1366,14 +1366,6 @@ return array(
       'javelin-vector',
       'javelin-dom',
     ),
-    '5a13c79f' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-util',
-      'javelin-vector',
-      'javelin-magical-init',
-    ),
     '5c54cbf3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1933,6 +1925,14 @@ return array(
       'javelin-util',
       'javelin-request',
     ),
+    'bea6e7f4' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-util',
+      'javelin-vector',
+      'javelin-magical-init',
+    ),
     'bee502c8' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/core/DraggableList.js b/webroot/rsrc/js/core/DraggableList.js
index 99dd6e8fba..a545ed7272 100644
--- a/webroot/rsrc/js/core/DraggableList.js
+++ b/webroot/rsrc/js/core/DraggableList.js
@@ -297,8 +297,13 @@ JX.install('DraggableList', {
 
           if (group[ii].getHasInfiniteHeight()) {
             // The math doesn't work out quite right if we actually use
-            // Math.Infinity, so approximate infinity as the document height.
-            infinity = infinity || JX.Vector.getDocument().y;
+            // Math.Infinity, so approximate infinity as the larger of the
+            // document height or viewport height.
+            if (!infinity) {
+              infinity = Math.max(
+                JX.Vector.getViewport().y,
+                JX.Vector.getDocument().y);
+            }
 
             rp.y = 0;
             rd.y = infinity;