diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 90056a29f2..1fca69f662 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1032,7 +1032,7 @@ celerity_register_resource_map(array(
   ),
   'javelin-behavior-device' =>
   array(
-    'uri' => '/res/37669d1a/rsrc/js/application/core/behavior-device.js',
+    'uri' => '/res/7f09d952/rsrc/js/application/core/behavior-device.js',
     'type' => 'js',
     'requires' =>
     array(
@@ -1517,7 +1517,7 @@ celerity_register_resource_map(array(
   ),
   'javelin-behavior-phabricator-nav' =>
   array(
-    'uri' => '/res/15ceb59f/rsrc/js/application/core/behavior-phabricator-nav.js',
+    'uri' => '/res/575be3cd/rsrc/js/application/core/behavior-phabricator-nav.js',
     'type' => 'js',
     'requires' =>
     array(
diff --git a/webroot/rsrc/js/application/core/behavior-device.js b/webroot/rsrc/js/application/core/behavior-device.js
index 06bd90a4b6..8c5686df3e 100644
--- a/webroot/rsrc/js/application/core/behavior-device.js
+++ b/webroot/rsrc/js/application/core/behavior-device.js
@@ -32,7 +32,7 @@ JX.behavior('device', function(config) {
     JX.DOM.alterClass(e, 'device-tablet', (device == 'tablet'));
     JX.DOM.alterClass(e, 'device-desktop', (device == 'desktop'));
 
-    JX.Stratcom.invoke('phabricator-device-change', device);
+    JX.Stratcom.invoke('phabricator-device-change', null, device);
   }
 
   JX.Stratcom.listen('resize', null, onresize);
diff --git a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js
index d4749c4169..8e7845e743 100644
--- a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js
+++ b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js
@@ -151,7 +151,7 @@ JX.behavior('phabricator-nav', function(config) {
           scale: 1,
 
           width: JX.Vector.getDim(local).x,
-          minWidth: 38,
+          minWidth: 1,
           minScale: 1
         },
         {
@@ -213,10 +213,16 @@ JX.behavior('phabricator-nav', function(config) {
 
 // - Navigation Reset ----------------------------------------------------------
 
-  JX.Stratcom.listen('phabricator-device-change', null, function(device) {
+  JX.Stratcom.listen('phabricator-device-change', null, function(event) {
     app.style.left = '';
-    local && (local.style.left = '');
-    content.style.left = '';
+    if (local) {
+      local.style.left = '';
+      local.style.width = '';
+    }
+    if (drag) {
+      drag.style.left = '';
+    }
+    content.style.marginLeft = '';
 
     select_button(2);
   });