diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index ba8eeda68..0e7de3048 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -1,3 +1,15 @@
+{{#if @model.isOrg}}
+  {{title (t "resources.org.title_plural") }}
+  {{title @model.displayName}}
+{{/if}}
+
+{{#if @model.isProject}}
+  {{title (t "resources.org.title_plural") }}
+  {{title this.scopes.selectedOrg.displayName}}
+  {{title (t "resources.project.title_plural") }}
+  {{title @model.displayName}}
+{{/if}}
+
 <Rose::Layout::Sidebar as |sidebarLayout|>
 
   {{#if this.session.isAuthenticated}}
diff --git a/ui/core/app/templates/scopes/scope/scopes.hbs b/ui/core/app/templates/scopes/scope/scopes.hbs
index c1cefb761..ef0177922 100644
--- a/ui/core/app/templates/scopes/scope/scopes.hbs
+++ b/ui/core/app/templates/scopes/scope/scopes.hbs
@@ -3,16 +3,7 @@
 {{/if}}
 
 {{#if @model.currentScope.isOrg}}
-  {{title (t "resources.org.title_plural") }}
-  {{title @model.currentScope.displayName}}
   {{title (t "resources.project.title_plural") }}
 {{/if}}
 
-{{#if @model.currentScope.isProject}}
-  {{title (t "resources.org.title_plural") }}
-  {{title @model.parentScope.displayName}}
-  {{title (t "resources.project.title_plural") }}
-  {{title @model.currentScope.displayName}}
-{{/if}}
-
 {{outlet}}