diff --git a/packages/entities/entities-certificates/src/components/CACertificateList.vue b/packages/entities/entities-certificates/src/components/CACertificateList.vue
index 8201321769..579cdb8f44 100644
--- a/packages/entities/entities-certificates/src/components/CACertificateList.vue
+++ b/packages/entities/entities-certificates/src/components/CACertificateList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-ca-certificate"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('ca-certificates.list.toolbar_actions.new_ca_certificate') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -116,6 +101,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-ca-certificate"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('ca-certificates.list.toolbar_actions.new_ca_certificate') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :entity-type="EntityTypes.CACertificate"
diff --git a/packages/entities/entities-certificates/src/components/CertificateList.vue b/packages/entities/entities-certificates/src/components/CertificateList.vue
index 6ad72db7e3..2f726e7324 100644
--- a/packages/entities/entities-certificates/src/components/CertificateList.vue
+++ b/packages/entities/entities-certificates/src/components/CertificateList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-certificate"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('certificates.list.toolbar_actions.new_certificate') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -140,6 +125,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-certificate"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('certificates.list.toolbar_actions.new_certificate') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :entity-type="EntityTypes.Certificate"
diff --git a/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.vue b/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.vue
index 898d0f207a..6e7390b5fb 100644
--- a/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.vue
+++ b/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.vue
@@ -20,21 +20,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-credential"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t(`credentials.list.toolbar_actions.${config.plugin}.new`) }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -173,6 +158,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-credential"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t(`credentials.list.toolbar_actions.${config.plugin}.new`) }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('credentials.delete.description')"
diff --git a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.vue b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.vue
index 8e02f6fed5..d34d6aeb8e 100644
--- a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.vue
+++ b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.vue
@@ -33,22 +33,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-consumer-group"
-              icon="plus"
-              size="large"
-              :to="config.consumerId ? undefined : config.createRoute"
-              @click="() => config.consumerId ? handleAddToGroupClick() : undefined"
-            >
-              {{ config.consumerId ? t('consumer_groups.actions.add_to_group') : t('consumer_groups.list.toolbar_actions.new_consumer_group') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -115,6 +99,23 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-consumer-group"
+          icon="plus"
+          size="large"
+          :to="config.consumerId ? undefined : config.createRoute"
+          @click="() => config.consumerId ? handleAddToGroupClick() : undefined"
+        >
+          {{ config.consumerId ? t('consumer_groups.actions.add_to_group') : t('consumer_groups.list.toolbar_actions.new_consumer_group') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       data-testid="delete-consumer-group-modal"
diff --git a/packages/entities/entities-consumers/src/components/ConsumerList.vue b/packages/entities/entities-consumers/src/components/ConsumerList.vue
index a3a2550afc..5d5de0da38 100644
--- a/packages/entities/entities-consumers/src/components/ConsumerList.vue
+++ b/packages/entities/entities-consumers/src/components/ConsumerList.vue
@@ -33,22 +33,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-consumer"
-              icon="plus"
-              size="large"
-              :to="config.consumerGroupId ? undefined : config.createRoute"
-              @click="() => config.consumerGroupId ? handleAddConsumerClick() : undefined"
-            >
-              {{ config.consumerGroupId ? t('consumers.actions.add_consumer') : t('consumers.list.toolbar_actions.new_consumer') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -115,6 +99,23 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-consumer"
+          icon="plus"
+          size="large"
+          :to="config.consumerGroupId ? undefined : config.createRoute"
+          @click="() => config.consumerGroupId ? handleAddConsumerClick() : undefined"
+        >
+          {{ config.consumerGroupId ? t('consumers.actions.add_consumer') : t('consumers.list.toolbar_actions.new_consumer') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-button-disabled="isDeletePending"
       data-testid="delete-consumer-modal"
diff --git a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
index 7f5925da37..ebea2dfa60 100644
--- a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
+++ b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-gateway-service"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('gateway_services.list.toolbar_actions.new_gateway_service') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -135,6 +120,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-gateway-service"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('gateway_services.list.toolbar_actions.new_gateway_service') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityToggleModal
       :action="modalContent.action"
       :entity-id="modalContent.id"
diff --git a/packages/entities/entities-key-sets/src/components/KeySetList.vue b/packages/entities/entities-key-sets/src/components/KeySetList.vue
index a8b73ec371..6a3a0be0db 100644
--- a/packages/entities/entities-key-sets/src/components/KeySetList.vue
+++ b/packages/entities/entities-key-sets/src/components/KeySetList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-key-set"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('keySets.list.toolbar_actions.new_key_set') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -113,6 +98,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-key-set"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('keySets.list.toolbar_actions.new_key_set') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('keySets.delete.description')"
diff --git a/packages/entities/entities-keys/src/components/KeyList.vue b/packages/entities/entities-keys/src/components/KeyList.vue
index 94349b9afe..081b23eba7 100644
--- a/packages/entities/entities-keys/src/components/KeyList.vue
+++ b/packages/entities/entities-keys/src/components/KeyList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-key"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('keys.list.toolbar_actions.new_key') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -116,6 +101,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-key"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('keys.list.toolbar_actions.new_key') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('keys.delete.description')"
diff --git a/packages/entities/entities-plugins/src/components/PluginList.vue b/packages/entities/entities-plugins/src/components/PluginList.vue
index aac59cd860..a5bd34f84c 100644
--- a/packages/entities/entities-plugins/src/components/PluginList.vue
+++ b/packages/entities/entities-plugins/src/components/PluginList.vue
@@ -32,21 +32,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-plugin"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('plugins.list.toolbar_actions.new_plugin') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -191,6 +176,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-plugin"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('plugins.list.toolbar_actions.new_plugin') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityToggleModal
       :action="modalContent.action"
       :entity-id="modalContent.id"
diff --git a/packages/entities/entities-routes/src/components/RouteList.vue b/packages/entities/entities-routes/src/components/RouteList.vue
index c1ddfa7ea1..601c486e95 100644
--- a/packages/entities/entities-routes/src/components/RouteList.vue
+++ b/packages/entities/entities-routes/src/components/RouteList.vue
@@ -32,21 +32,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-route"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('routes.list.toolbar_actions.new_route') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -170,6 +155,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-route"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('routes.list.toolbar_actions.new_route') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('delete.description')"
diff --git a/packages/entities/entities-snis/src/components/SniList.vue b/packages/entities/entities-snis/src/components/SniList.vue
index 90466f7526..3f7987a009 100644
--- a/packages/entities/entities-snis/src/components/SniList.vue
+++ b/packages/entities/entities-snis/src/components/SniList.vue
@@ -30,21 +30,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-sni"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('snis.list.toolbar_actions.new') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -111,6 +96,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-sni"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('snis.list.toolbar_actions.new') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('delete.description')"
diff --git a/packages/entities/entities-upstreams-targets/src/components/TargetsList.vue b/packages/entities/entities-upstreams-targets/src/components/TargetsList.vue
index 4583d752aa..90f772da50 100644
--- a/packages/entities/entities-upstreams-targets/src/components/TargetsList.vue
+++ b/packages/entities/entities-upstreams-targets/src/components/TargetsList.vue
@@ -20,21 +20,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-new-target"
-              icon="plus"
-              :to="props.config.createRoute ? props.config.createRoute : undefined"
-              @click="() => !props.config.createRoute ? handleCreateTarget() : undefined"
-            >
-              {{ t('targets.list.toolbar_actions.new_target') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column formatting -->
@@ -109,6 +94,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-new-target"
+          icon="plus"
+          :to="props.config.createRoute ? props.config.createRoute : undefined"
+          @click="() => !props.config.createRoute ? handleCreateTarget() : undefined"
+        >
+          {{ t('targets.list.toolbar_actions.new_target') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('targets.delete.description')"
diff --git a/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.vue b/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.vue
index 4091fe5ab7..49f036786d 100644
--- a/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.vue
+++ b/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.vue
@@ -30,21 +30,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-upstream"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('upstreams.list.toolbar_actions.new_upstream') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column formatting -->
@@ -107,6 +92,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-upstream"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('upstreams.list.toolbar_actions.new_upstream') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('upstreams.delete.description')"
diff --git a/packages/entities/entities-vaults/src/components/VaultList.vue b/packages/entities/entities-vaults/src/components/VaultList.vue
index cafd061f73..a6c6e02b4d 100644
--- a/packages/entities/entities-vaults/src/components/VaultList.vue
+++ b/packages/entities/entities-vaults/src/components/VaultList.vue
@@ -29,21 +29,6 @@
       <template #toolbar-button>
         <!-- render this fallback div for Kong Manager instead, as there is no kong-ui-app-page-header-action-button target to go to in KM -->
         <div id="kong-ui-app-page-header-action-button-default" />
-        <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
-          <PermissionsWrapper :auth-function="() => canCreate()">
-            <!-- Hide Create button if table is empty -->
-            <KButton
-              v-show="hasData"
-              appearance="primary"
-              data-testid="toolbar-add-vault"
-              icon="plus"
-              size="large"
-              :to="config.createRoute"
-            >
-              {{ t('vaults.list.toolbar_actions.new_vault') }}
-            </KButton>
-          </PermissionsWrapper>
-        </Teleport>
       </template>
 
       <!-- Column Formatting -->
@@ -117,6 +102,22 @@
       </template>
     </EntityBaseTable>
 
+    <Teleport :to="useActionOutside ? '#kong-ui-app-page-header-action-button' : '#kong-ui-app-page-header-action-button-default'">
+      <PermissionsWrapper :auth-function="() => canCreate()">
+        <!-- Hide Create button if table is empty -->
+        <KButton
+          v-show="hasData"
+          appearance="primary"
+          data-testid="toolbar-add-vault"
+          icon="plus"
+          size="large"
+          :to="config.createRoute"
+        >
+          {{ t('vaults.list.toolbar_actions.new_vault') }}
+        </KButton>
+      </PermissionsWrapper>
+    </Teleport>
+
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('delete.description')"