diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
index 7d5dc37e0b..2e53fe7276 100644
--- a/src/applications/project/controller/PhabricatorProjectViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
@@ -1,37 +1,48 @@
 <?php
 
 final class PhabricatorProjectViewController
   extends PhabricatorProjectController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $request = $this->getRequest();
     $viewer = $request->getViewer();
 
     $response = $this->loadProject();
     if ($response) {
       return $response;
     }
     $project = $this->getProject();
 
     $engine = $this->getProfileMenuEngine();
     $default = $engine->getDefaultItem();
 
+    // If defaults are broken somehow, serve the manage page. See T13033 for
+    // discussion.
+    if ($default) {
+      $default_key = $default->getBuiltinKey();
+    } else {
+      $default_key = PhabricatorProject::ITEM_MANAGE;
+    }
+
     switch ($default->getBuiltinKey()) {
       case PhabricatorProject::ITEM_WORKBOARD:
         $controller_object = new PhabricatorProjectBoardViewController();
         break;
       case PhabricatorProject::ITEM_PROFILE:
         $controller_object = new PhabricatorProjectProfileController();
         break;
+      case PhabricatorProject::ITEM_MANAGE:
+        $controller_object = new PhabricatorProjectManageController();
+        break;
       default:
         return $engine->buildResponse();
     }
 
     return $this->delegateToController($controller_object);
   }
 
 }
diff --git a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
index ddb59ec095..1bd7e796dc 100644
--- a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
+++ b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
@@ -1,64 +1,69 @@
 <?php
 
 final class PhabricatorProjectManageProfileMenuItem
   extends PhabricatorProfileMenuItem {
 
   const MENUITEMKEY = 'project.manage';
 
   public function getMenuItemTypeName() {
     return pht('Manage Project');
   }
 
   private function getDefaultName() {
     return pht('Manage');
   }
 
   public function canHideMenuItem(
     PhabricatorProfileMenuItemConfiguration $config) {
     return false;
   }
 
+  public function canMakeDefault(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    return true;
+  }
+
   public function getDisplayName(
     PhabricatorProfileMenuItemConfiguration $config) {
     $name = $config->getMenuItemProperty('name');
 
     if (strlen($name)) {
       return $name;
     }
 
     return $this->getDefaultName();
   }
 
   public function buildEditEngineFields(
     PhabricatorProfileMenuItemConfiguration $config) {
     return array(
       id(new PhabricatorTextEditField())
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setPlaceholder($this->getDefaultName())
         ->setValue($config->getMenuItemProperty('name')),
     );
   }
 
   protected function newNavigationMenuItems(
     PhabricatorProfileMenuItemConfiguration $config) {
 
     $project = $config->getProfileObject();
 
     $id = $project->getID();
 
     $name = $this->getDisplayName($config);
     $icon = 'fa-gears';
     $href = "/project/manage/{$id}/";
 
     $item = $this->newItem()
       ->setHref($href)
       ->setName($name)
       ->setIcon($icon);
 
     return array(
       $item,
     );
   }
 
 }