diff --git a/ui/core/app/router.js b/ui/core/app/router.js
index 68162d24d..e23cf038a 100644
--- a/ui/core/app/router.js
+++ b/ui/core/app/router.js
@@ -10,7 +10,7 @@ Router.map(function () {
   this.route('orgs', function () {
     this.route('org', { path: ':org_id' }, function () {
       this.route('projects', function () {
-        this.route('project', { path: ':project_id' });
+        this.route('project', { path: ':project_id' }, function() {});
         this.route('new');
       });
     });
diff --git a/ui/core/app/routes/orgs/org/projects/project/index.js b/ui/core/app/routes/orgs/org/projects/project/index.js
new file mode 100644
index 000000000..0843242d7
--- /dev/null
+++ b/ui/core/app/routes/orgs/org/projects/project/index.js
@@ -0,0 +1,4 @@
+import Route from '@ember/routing/route';
+
+export default class OrgsOrgProjectsProjectIndexRoute extends Route {
+}
diff --git a/ui/core/app/templates/orgs/org/projects/project.hbs b/ui/core/app/templates/orgs/org/projects/project.hbs
index 26770d11b..2b05f838d 100644
--- a/ui/core/app/templates/orgs/org/projects/project.hbs
+++ b/ui/core/app/templates/orgs/org/projects/project.hbs
@@ -1,35 +1,3 @@
 {{title @model.name}}
 
-<div class="project-overview">
-  <div class="breadcrumbs">
-    <LinkTo @route='orgs.org.projects'>{{t "resources.projects"}}</LinkTo>
-    >
-    <LinkTo @route='orgs.org.projects.project'>{{@model.name}}</LinkTo>
-  </div>
-
-  <h2>{{t "resources.project.settings"}}</h2>
-
-  <Rose::Nav::Tabs as |nav|>
-    <nav.link @route='orgs.org.projects.project'>
-      {{t 'dev.item-name'}}
-    </nav.link>
-    <nav.link @route='index'>
-      {{t 'dev.item-name'}}
-    </nav.link>
-  </Rose::Nav::Tabs>
-
-  <Form::Project
-    @model={{@model}}
-    @submit={{route-action "save" @model}}
-    @cancel={{route-action "cancel" @model}}
-    class="project-new-form"
-  />
-
-  <Rose::Button
-    @style="warning"
-    @disabled={{@model.canSave}}
-    {{on "click" (route-action "delete" @model)}}
-  >
-    {{t 'actions.delete'}}
-  </Rose::Button>
-</div>
+{{outlet}}
diff --git a/ui/core/app/templates/orgs/org/projects/project/index.hbs b/ui/core/app/templates/orgs/org/projects/project/index.hbs
new file mode 100644
index 000000000..08f65ebe0
--- /dev/null
+++ b/ui/core/app/templates/orgs/org/projects/project/index.hbs
@@ -0,0 +1,33 @@
+<div class="project-overview">
+  <div class="breadcrumbs">
+    <LinkTo @route='orgs.org.projects'>{{t "resources.projects"}}</LinkTo>
+    >
+    <LinkTo @route='orgs.org.projects.project'>{{@model.name}}</LinkTo>
+  </div>
+
+  <h2>{{t "resources.project.settings"}}</h2>
+
+  <Rose::Nav::Tabs as |nav|>
+    <nav.link @route='orgs.org.projects.project'>
+      {{t 'dev.item-name'}}
+    </nav.link>
+    <nav.link @route='index'>
+      {{t 'dev.item-name'}}
+    </nav.link>
+  </Rose::Nav::Tabs>
+
+  <Form::Project
+    @model={{@model}}
+    @submit={{route-action "save" @model}}
+    @cancel={{route-action "cancel" @model}}
+    class="project-new-form"
+  />
+
+  <Rose::Button
+    @style="warning"
+    @disabled={{@model.canSave}}
+    {{on "click" (route-action "delete" @model)}}
+  >
+    {{t 'actions.delete'}}
+  </Rose::Button>
+</div>
diff --git a/ui/core/tests/unit/routes/orgs/org/projects/project/index-test.js b/ui/core/tests/unit/routes/orgs/org/projects/project/index-test.js
new file mode 100644
index 000000000..bc1d36103
--- /dev/null
+++ b/ui/core/tests/unit/routes/orgs/org/projects/project/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | orgs/org/projects/project/index', function(hooks) {
+  setupTest(hooks);
+
+  test('it exists', function(assert) {
+    let route = this.owner.lookup('route:orgs/org/projects/project/index');
+    assert.ok(route);
+  });
+});