diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
index 0f5f90a737..2d00c4c90c 100644
--- a/src/applications/project/application/PhabricatorProjectApplication.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -65,8 +65,6 @@ final class PhabricatorProjectApplication extends PhabricatorApplication {
           => $this->getPanelRouting('PhabricatorProjectPanelController'),
         'subprojects/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectSubprojectsController',
-        'milestones/(?P<id>[1-9]\d*)/'
-          => 'PhabricatorProjectMilestonesController',
         'board/(?P<id>[1-9]\d*)/'.
           '(?P<filter>filter/)?'.
           '(?:query/(?P<queryKey>[^/]+)/)?'
diff --git a/src/applications/project/engine/PhabricatorProjectEditEngine.php b/src/applications/project/engine/PhabricatorProjectEditEngine.php
index 54144cbbb5..71f91b7bc1 100644
--- a/src/applications/project/engine/PhabricatorProjectEditEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectEditEngine.php
@@ -88,15 +88,11 @@ final class PhabricatorProjectEditEngine
 
   protected function getObjectCreateCancelURI($object) {
     $parent = $this->getParentProject();
-    if ($parent) {
-      $id = $parent->getID();
-      return "/project/subprojects/{$id}/";
-    }
-
     $milestone = $this->getMilestoneProject();
-    if ($milestone) {
-      $id = $milestone->getID();
-      return "/project/milestones/{$id}/";
+
+    if ($parent || $milestone) {
+      $id = nonempty($parent, $milestone)->getID();
+      return "/project/subprojects/{$id}/";
     }
 
     return parent::getObjectCreateCancelURI($object);