diff --git a/ui/core/app/routes/scopes/scope/projects/project.js b/ui/core/app/routes/scopes/scope/projects/project.js
index dae7bbcd3..5907122b9 100644
--- a/ui/core/app/routes/scopes/scope/projects/project.js
+++ b/ui/core/app/routes/scopes/scope/projects/project.js
@@ -20,11 +20,12 @@ export default class ScopesScopeProjectsProjectRoute extends Route {
    * @param {object} model
    */
   renderTemplate(controller, model) {
+    super.renderTemplate(...arguments);
+
     this.render('scopes/scope/projects/project/_sidebar', {
       into: 'scopes/scope',
       outlet: 'sidebar',
       model: model
     });
-    super.renderTemplate(...arguments);
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
index 00768575f..7247e9446 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
@@ -24,7 +24,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogRoute exte
    * @param {object} model
    */
   renderTemplate(controller, model) {
-    this.render('scopes/scope/projects/project/host-catalogs/host-catalog');
+    super.renderTemplate(...arguments);
 
     this.render('scopes/scope/projects/project/host-catalogs/host-catalog/-header', {
       into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new.js
index 01bb5caad..87f67abc7 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new.js
@@ -23,7 +23,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsNe
    * @param {object} model
    */
   renderTemplate(controller, model) {
-    this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new');
+    super.renderTemplate(...arguments);
 
     this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header', {
       into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
@@ -31,13 +31,13 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsNe
       model: model
     });
 
-    this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-navigation', {
+    this.render('_empty', {
       into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
       outlet: 'navigation',
       model: model
     });
 
-    this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-actions', {
+    this.render('_empty', {
       into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
       outlet: 'actions',
       model: model
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-actions.hbs b/ui/core/app/templates/_empty.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-actions.hbs
rename to ui/core/app/templates/_empty.hbs
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
index b905f8d7d..9f1032438 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
@@ -1,4 +1,11 @@
 <Rose::Dropdown @text="{{t 'form.label.manage'}}" @dropdownRight={{true}} as |dropdown|>
+  <dropdown.link
+    @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.new"
+    @model={{@model}}
+  >
+    {{t "actions.add-host-set"}}
+  </dropdown.link>
+  <dropdown.separator />
   <dropdown.button
     @style="danger"
     @disabled={{@model.canSave}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
index f3d6eb44a..8b7dc963b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
@@ -1,10 +1,5 @@
 {{#if @model}}
-  <Rose::LinkButton @style="ghost"
-    @iconLeft="plus-plain"
-    @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.new"
-  >
-    {{t "actions.add-host-set"}}
-  </Rose::LinkButton>
+
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
@@ -35,7 +30,9 @@
       {{/each}}
     </table.body>
   </Rose::Table>
+
 {{else}}
+
   <Rose::Layout::Centered>
     <Rose::Message @title={{t "titles.host-sets-welcome"}} as |message|>
       <message.description>
@@ -47,4 +44,5 @@
       </message.link>
     </Rose::Message>
   </Rose::Layout::Centered>
-{{/if}}
\ No newline at end of file
+
+{{/if}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-navigation.hbs
deleted file mode 100644
index e69de29bb..000000000