diff --git a/ui/packages/consul-ui/app/templates/application.hbs b/ui/packages/consul-ui/app/templates/application.hbs
index 24ff2b9ada..c19a304e2e 100644
--- a/ui/packages/consul-ui/app/templates/application.hbs
+++ b/ui/packages/consul-ui/app/templates/application.hbs
@@ -1,5 +1,5 @@
 <HeadLayout />
-{{title 'Consul' separator=' - '}}
+{{page-title 'Consul' separator=' - '}}
 {{#if (not-eq router.currentRouteName 'application')}}
   <HashicorpConsul
     id="wrapper"
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
index c09685958b..5d932fc7e0 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
@@ -1,11 +1,11 @@
 {{#if isAuthorized }}
   {{#if create }}
-      {{title 'New Policy'}}
+      {{page-title 'New Policy'}}
   {{else}}
-      {{title 'Edit Policy'}}
+      {{page-title 'Edit Policy'}}
   {{/if}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 <AppView
   @authorized={{isAuthorized}}
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
index d3a996826e..3e9a1eb679 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
@@ -1,7 +1,7 @@
 {{#if isAuthorized }}
-  {{title 'Policies'}}
+  {{page-title 'Policies'}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 {{#let (hash
   kinds=(if kind (split kind ',') undefined)
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
index a17f125004..fa1ae716ef 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
@@ -1,11 +1,11 @@
 {{#if isAuthorized }}
   {{#if item.ID}}
-    {{title 'Edit Role'}}
+    {{page-title 'Edit Role'}}
   {{else}}
-    {{title 'New Role'}}
+    {{page-title 'New Role'}}
   {{/if}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 <AppView
   @authorized={{isAuthorized}}
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
index 70101bf678..ed80d78ab0 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
@@ -1,7 +1,7 @@
 {{#if isAuthorized }}
-  {{title 'Roles'}}
+  {{page-title 'Roles'}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 
 {{#let (or sortBy "Name:asc") as |sort|}}
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
index c3b89f99be..f18a7cef32 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
@@ -1,11 +1,11 @@
 {{#if isAuthorized }}
   {{#if create}}
-    {{title 'New Token'}}
+    {{page-title 'New Token'}}
   {{else}}
-    {{title 'Edit Token'}}
+    {{page-title 'Edit Token'}}
   {{/if}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 <AppView
   @authorized={{isAuthorized}}
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
index 2758450378..719c52827b 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
@@ -1,7 +1,7 @@
 {{#if isAuthorized }}
-  {{title 'Tokens'}}
+  {{page-title 'Tokens'}}
 {{else}}
-  {{title 'Access Controls'}}
+  {{page-title 'Access Controls'}}
 {{/if}}
 
 {{#let (hash
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
index d837c857da..9978385edf 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
@@ -1,7 +1,7 @@
 {{#if item.ID}}
-    {{title 'Edit Intention'}}
+    {{page-title 'Edit Intention'}}
 {{else}}
-    {{title 'New Intention'}}
+    {{page-title 'New Intention'}}
 {{/if}}
 <AppView>
     <BlockSlot @name="breadcrumbs">
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
index b3657f6a68..07926611b5 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
@@ -1,4 +1,4 @@
-{{title 'Intentions'}}
+{{page-title 'Intentions'}}
 <DataLoader @src={{concat '/' nspace '/' dc '/intentions'}} as |api|>
 
   <BlockSlot @name="error">
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
index 59a89c43bc..03ea5661e9 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
@@ -1,7 +1,7 @@
 {{#if item.Key }}
-  {{title 'Edit Key/Value'}}
+  {{page-title 'Edit Key/Value'}}
 {{else}}
-  {{title 'New Key/Value'}}
+  {{page-title 'New Key/Value'}}
 {{/if}}
 <AppView>
   <BlockSlot @name="breadcrumbs">
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
index f42a1f59ab..38b882b8e1 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
@@ -1,4 +1,4 @@
-{{title 'Key/Value'}}
+{{page-title 'Key/Value'}}
 {{#let (or sortBy "isFolder:asc") as |sort|}}
   <AppView>
     <BlockSlot @name="breadcrumbs">
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
index ccff471e35..b68347a816 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
@@ -1,4 +1,4 @@
-{{title 'Nodes'}}
+{{page-title 'Nodes'}}
 <EventSource @src={{items}} />
 <EventSource @src={{leader}} />
 {{#let (hash
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
index 5f12fbc795..80f48562c2 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
@@ -1,4 +1,4 @@
-{{title item.Node}}
+{{page-title item.Node}}
 <DataLoader as |api|>
 
   <BlockSlot @name="data">
diff --git a/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs b/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
index 72bdd234d0..bf2a5eab65 100644
--- a/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
@@ -1,7 +1,7 @@
 {{#if create }}
-  {{title 'New Namespace'}}
+  {{page-title 'New Namespace'}}
 {{else}}
-  {{title 'Edit Namespace'}}
+  {{page-title 'Edit Namespace'}}
 {{/if}}
 <AppView>
   <BlockSlot @name="notification" as |status type item error|>
diff --git a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
index 32bd2627a1..5abe5a8a34 100644
--- a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
@@ -1,4 +1,4 @@
-{{title 'Namespaces'}}
+{{page-title 'Namespaces'}}
 {{#let (or sortBy "Name:asc") as |sort|}}
 <EventSource @src={{items}} />
 <AppView>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
index 53e5747c87..b2ebf4f23d 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -1,4 +1,4 @@
-{{title 'Services'}}
+{{page-title 'Services'}}
 <EventSource @src={{items}} />
 {{#let (hash
   statuses=(if status (split status ',') undefined)
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
index 2bf7bb194b..bddb962723 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
@@ -1,4 +1,4 @@
-{{title item.Service.ID}}
+{{page-title item.Service.ID}}
 <EventSource @src={{item}} @onerror={{action "error"}} />
 <EventSource @src={{proxy}} />
 <EventSource @src={{proxyMeta}} />
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
index c5f454158f..a051e3cafe 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
@@ -4,7 +4,7 @@
 <EventSource @src={{proxies}} />
 <EventSource @src={{gatewayServices}} />
 <EventSource @src={{topology}} />
-{{title item.Service.Service}}
+{{page-title item.Service.Service}}
 <AppView>
   <BlockSlot @name="notification" as |status type|>
     <Consul::Service::Notifications
diff --git a/ui/packages/consul-ui/app/templates/settings.hbs b/ui/packages/consul-ui/app/templates/settings.hbs
index daeea977ac..69536eaa8d 100644
--- a/ui/packages/consul-ui/app/templates/settings.hbs
+++ b/ui/packages/consul-ui/app/templates/settings.hbs
@@ -1,4 +1,4 @@
-{{title "Settings"}}
+{{page-title "Settings"}}
 <AppView>
   <BlockSlot @name="header">
     <h1>