diff --git a/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
index a39dfaa632..0a15a62417 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
@@ -1,231 +1,248 @@
 <?php
 
 final class DiffusionRepositoryStorageManagementPanel
   extends DiffusionRepositoryManagementPanel {
 
   const PANELKEY = 'storage';
 
   public function getManagementPanelLabel() {
     return pht('Storage');
   }
 
   public function getManagementPanelOrder() {
     return 600;
   }
 
   public function getManagementPanelIcon() {
     return 'fa-database';
   }
 
   public function buildManagementPanelContent() {
     return array(
       $this->buildStorageStatusPanel(),
       $this->buildClusterStatusPanel(),
     );
   }
 
   private function buildStorageStatusPanel() {
     $repository = $this->getRepository();
     $viewer = $this->getViewer();
 
     $view = id(new PHUIPropertyListView())
       ->setViewer($viewer);
 
     if ($repository->usesLocalWorkingCopy()) {
       $storage_path = $repository->getLocalPath();
     } else {
       $storage_path = phutil_tag('em', array(), pht('No Local Working Copy'));
     }
 
     $service_phid = $repository->getAlmanacServicePHID();
     if ($service_phid) {
       $storage_service = $viewer->renderHandle($service_phid);
     } else {
       $storage_service = phutil_tag('em', array(), pht('Local'));
     }
 
     $view->addProperty(pht('Storage Path'), $storage_path);
     $view->addProperty(pht('Storage Cluster'), $storage_service);
 
     $doc_href = PhabricatorEnv::getDoclink('Cluster: Repositories');
 
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon('fa-book')
       ->setHref($doc_href)
       ->setText(pht('Help'));
 
     return $this->newBox(pht('Storage'), $view, array($button));
   }
 
   private function buildClusterStatusPanel() {
     $repository = $this->getRepository();
     $viewer = $this->getViewer();
 
     $service_phid = $repository->getAlmanacServicePHID();
     if ($service_phid) {
       $service = id(new AlmanacServiceQuery())
         ->setViewer($viewer)
         ->withServiceTypes(
           array(
             AlmanacClusterRepositoryServiceType::SERVICETYPE,
           ))
         ->withPHIDs(array($service_phid))
         ->needBindings(true)
         ->executeOne();
       if (!$service) {
         // TODO: Viewer may not have permission to see the service, or it may
         // be invalid? Raise some more useful error here?
         throw new Exception(pht('Unable to load cluster service.'));
       }
     } else {
       $service = null;
     }
 
     Javelin::initBehavior('phabricator-tooltips');
 
     $rows = array();
     if ($service) {
       $bindings = $service->getBindings();
       $bindings = mgroup($bindings, 'getDevicePHID');
 
       // This is an unusual read which always comes from the master.
       if (PhabricatorEnv::isReadOnly()) {
         $versions = array();
       } else {
         $versions = PhabricatorRepositoryWorkingCopyVersion::loadVersions(
           $repository->getPHID());
       }
 
       $versions = mpull($versions, null, 'getDevicePHID');
 
-      foreach ($bindings as $binding_group) {
-        $all_disabled = true;
-        foreach ($binding_group as $binding) {
-          if (!$binding->getIsDisabled()) {
-            $all_disabled = false;
-            break;
-          }
-        }
+      // List enabled devices first, then sort devices in each group by name.
+      $sort = array();
+      foreach ($bindings as $key => $binding_group) {
+        $all_disabled = $this->isDisabledGroup($binding_group);
+
+        $sort[$key] = id(new PhutilSortVector())
+          ->addInt($all_disabled ? 1 : 0)
+          ->addString(head($binding_group)->getDevice()->getName());
+      }
+      $sort = msortv($sort, 'getSelf');
+      $bindings = array_select_keys($bindings, array_keys($sort)) + $bindings;
 
+      foreach ($bindings as $binding_group) {
+        $all_disabled = $this->isDisabledGroup($binding_group);
         $any_binding = head($binding_group);
 
         if ($all_disabled) {
           $binding_icon = 'fa-times grey';
           $binding_tip = pht('Disabled');
         } else {
           $binding_icon = 'fa-folder-open green';
           $binding_tip = pht('Active');
         }
 
         $binding_icon = id(new PHUIIconView())
           ->setIcon($binding_icon)
           ->addSigil('has-tooltip')
           ->setMetadata(
             array(
               'tip' => $binding_tip,
             ));
 
         $device = $any_binding->getDevice();
 
         $version = idx($versions, $device->getPHID());
         if ($version) {
           $version_number = $version->getRepositoryVersion();
 
           $href = null;
           if ($repository->isHosted()) {
             $href = "/diffusion/pushlog/view/{$version_number}/";
           } else {
             $commit = id(new DiffusionCommitQuery())
               ->setViewer($viewer)
               ->withIDs(array($version_number))
               ->executeOne();
             if ($commit) {
               $href = $commit->getURI();
             }
           }
 
           if ($href) {
             $version_number = phutil_tag(
               'a',
               array(
                 'href' => $href,
               ),
               $version_number);
           }
         } else {
           $version_number = '-';
         }
 
         if ($version && $version->getIsWriting()) {
           $is_writing = id(new PHUIIconView())
             ->setIcon('fa-pencil green');
         } else {
           $is_writing = id(new PHUIIconView())
             ->setIcon('fa-pencil grey');
         }
 
         $write_properties = null;
         if ($version) {
           $write_properties = $version->getWriteProperties();
           if ($write_properties) {
             try {
               $write_properties = phutil_json_decode($write_properties);
             } catch (Exception $ex) {
               $write_properties = null;
             }
           }
         }
 
         if ($write_properties) {
           $writer_phid = idx($write_properties, 'userPHID');
           $last_writer = $viewer->renderHandle($writer_phid);
 
           $writer_epoch = idx($write_properties, 'epoch');
           $writer_epoch = phabricator_datetime($writer_epoch, $viewer);
         } else {
           $last_writer = null;
           $writer_epoch = null;
         }
 
         $rows[] = array(
           $binding_icon,
           phutil_tag(
             'a',
             array(
               'href' => $device->getURI(),
             ),
             $device->getName()),
           $version_number,
           $is_writing,
           $last_writer,
           $writer_epoch,
         );
       }
     }
 
     $table = id(new AphrontTableView($rows))
       ->setNoDataString(pht('This is not a cluster repository.'))
       ->setHeaders(
         array(
           null,
           pht('Device'),
           pht('Version'),
           pht('Writing'),
           pht('Last Writer'),
           pht('Last Write At'),
         ))
       ->setColumnClasses(
         array(
           null,
           null,
           null,
           'right wide',
           null,
           'date',
         ));
 
     return $this->newBox(pht('Cluster Status'), $table);
   }
 
+  private function isDisabledGroup(array $binding_group) {
+    assert_instances_of($binding_group, 'AlmanacBinding');
+
+    foreach ($binding_group as $binding) {
+      if (!$binding->getIsDisabled()) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
 }