diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 616bdc80bd..3896f92460 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -428,9 +428,9 @@ var tower = angular.module('Tower', [
                 }
             }).
 
-            state('projectAdd', {
-                url: '/projects/add',
-                templateUrl: urlPrefix + 'partials/projects.html',
+            state('projects.add', {
+                url: '/add',
+                templateUrl: urlPrefix + 'partials/projects.add.html',
                 controller: ProjectsAdd,
                 ncyBreadcrumb: {
                     parent: "projects",
@@ -443,8 +443,8 @@ var tower = angular.module('Tower', [
                 }
             }).
 
-            state('projectEdit', {
-                url: '/projects/:id',
+            state('projects.edit', {
+                url: '/:id',
                 templateUrl: urlPrefix + 'partials/projects.html',
                 controller: ProjectsEdit,
                 resolve: {
@@ -501,8 +501,8 @@ var tower = angular.module('Tower', [
                 }
             }).
 
-            state('inventoryAdd', {
-                url: '/inventories/add',
+            state('inventories.add', {
+                url: '/add',
                 templateUrl: urlPrefix + 'partials/inventories.html',
                 controller: InventoriesAdd,
                 ncyBreadcrumb: {
@@ -516,8 +516,8 @@ var tower = angular.module('Tower', [
                 }
             }).
 
-            state('inventoryEdit', {
-                url: '/inventories/:inventory_id',
+            state('inventories.edit', {
+                url: '/:inventory_id',
                 templateUrl: urlPrefix + 'partials/inventories.html',
                 controller: InventoriesEdit,
                 resolve: {
diff --git a/awx/ui/client/src/controllers/Inventories.js b/awx/ui/client/src/controllers/Inventories.js
index 3e6348093f..bef5ae1680 100644
--- a/awx/ui/client/src/controllers/Inventories.js
+++ b/awx/ui/client/src/controllers/Inventories.js
@@ -317,7 +317,8 @@ export function InventoriesList($scope, $rootScope, $location, $log,
     };
 
     $scope.editInventory = function (id) {
-        $location.path($location.path() + '/' + id);
+        // $location.path($location.path() + '/' + id);
+        $state.go('inventories.edit', {inventory_id: id});
     };
 
     $scope.manageInventory = function(id){
diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js
index 2a6b404f69..93ae7eee7c 100644
--- a/awx/ui/client/src/controllers/Projects.js
+++ b/awx/ui/client/src/controllers/Projects.js
@@ -11,9 +11,11 @@
 */
 
 
-export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, ProjectList, GenerateList, LoadBreadCrumbs,
-    Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, ProjectUpdate,
-    Refresh, Wait, Stream, GetChoices, Empty, Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter) {
+export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
+    Rest, Alert, ProjectList, GenerateList, LoadBreadCrumbs, Prompt, SearchInit,
+    PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
+    SelectionInit, ProjectUpdate, Refresh, Wait, Stream, GetChoices, Empty,
+    Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) {
 
     ClearScope();
 
@@ -197,11 +199,13 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
     };
 
     $scope.addProject = function () {
-        $location.path($location.path() + '/add');
+        // $location.path($location.path() + '/add');
+        $state.transitionTo('projects.add');
     };
 
     $scope.editProject = function (id) {
-        $location.path($location.path() + '/' + id);
+        // $location.path($location.path() + '/' + id);
+        $state.transitionTo('projects.edit', {id: id});
     };
 
     if ($scope.removeShowLogViewer) {
@@ -392,7 +396,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
 ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList',
     'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath',
     'SelectionInit', 'ProjectUpdate', 'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find',
-    'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter'
+    'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state'
 ];
 
 
diff --git a/awx/ui/client/src/partials/projects.add.html b/awx/ui/client/src/partials/projects.add.html
new file mode 100644
index 0000000000..7d2a014836
--- /dev/null
+++ b/awx/ui/client/src/partials/projects.add.html
@@ -0,0 +1 @@
+<div ng-cloak id="htmlTemplate"></div>
diff --git a/awx/ui/client/src/partials/projects.html b/awx/ui/client/src/partials/projects.html
index b8f1781cf7..e29553bcd8 100644
--- a/awx/ui/client/src/partials/projects.html
+++ b/awx/ui/client/src/partials/projects.html
@@ -1,5 +1,6 @@
 <div class="tab-pane" id="projects">
+    <div ui-view></div>
   <div ng-cloak id="htmlTemplate"></div>
   <div ng-include="'/static/partials/logviewer.html'"></div>
   <div ng-include="'/static/partials/schedule_dialog.html'"></div>
-</div>
\ No newline at end of file
+</div>