diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js
index 470404b8e..74e07f892 100644
--- a/app/kubernetes/__module.js
+++ b/app/kubernetes/__module.js
@@ -293,15 +293,12 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
 
     const deploy = {
       name: 'kubernetes.deploy',
-      url: '/deploy?templateId',
+      url: '/deploy?templateId&referrer',
       views: {
         'content@': {
           component: 'kubernetesDeployView',
         },
       },
-      params: {
-        templateId: '',
-      },
     };
 
     const resourcePools = {
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index af5adf0c3..4364851d4 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -89,7 +89,7 @@
             ng-if="$ctrl.isPrimary"
             type="button"
             class="btn btn-sm btn-primary vertical-center !ml-0 h-fit"
-            ui-sref="kubernetes.deploy"
+            ui-sref="kubernetes.deploy({ referrer: 'kubernetes.applications' })"
             data-cy="k8sApp-deployFromManifestButton"
           >
             <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Create from manifest
diff --git a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
index 494a42e15..722ca5acb 100644
--- a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
+++ b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
@@ -37,7 +37,12 @@
             <button type="button" class="btn btn-sm btn-secondary vertical-center !ml-0" ui-sref="kubernetes.configurations.new" data-cy="k8sConfig-addConfigWithFormButton">
               <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Add with form
             </button>
-            <button type="button" class="btn btn-sm btn-primary vertical-center !ml-0" ui-sref="kubernetes.deploy" data-cy="k8sConfig-deployFromManifestButton">
+            <button
+              type="button"
+              class="btn btn-sm btn-primary vertical-center !ml-0"
+              ui-sref="kubernetes.deploy({ referrer: 'kubernetes.configurations' })"
+              data-cy="k8sConfig-deployFromManifestButton"
+            >
               <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Create from manifest
             </button>
           </div>
diff --git a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
index cd3b03151..824dc3cba 100644
--- a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
@@ -36,7 +36,12 @@
             <button type="button" class="btn btn-sm btn-secondary !ml-0" ui-sref="kubernetes.resourcePools.new" data-cy="k8sNamespace-addNamespaceWithFormButton">
               <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Add with form
             </button>
-            <button type="button" class="btn btn-sm btn-primary !ml-0" ui-sref="kubernetes.deploy" data-cy="k8sNamespace-deployFromManifestButton">
+            <button
+              type="button"
+              class="btn btn-sm btn-primary !ml-0"
+              ui-sref="kubernetes.deploy({ referrer: 'kubernetes.resourcePools' })"
+              data-cy="k8sNamespace-deployFromManifestButton"
+            >
               <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Create from manifest
             </button>
           </div>
diff --git a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
index 7a02b8a67..7d2691155 100644
--- a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
@@ -30,7 +30,12 @@
           <pr-icon icon="'trash-2'"></pr-icon>
           Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary vertical-center !ml-0" ui-sref="kubernetes.deploy" data-cy="k8sVolume-deployFromManifestButton">
+        <button
+          type="button"
+          class="btn btn-sm btn-primary vertical-center !ml-0"
+          ui-sref="kubernetes.deploy({ referrer: 'kubernetes.volumes' })"
+          data-cy="k8sVolume-deployFromManifestButton"
+        >
           <pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>
           Create from manifest
         </button>
diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js
index eeda9a594..9ffcb1e11 100644
--- a/app/kubernetes/views/deploy/deployController.js
+++ b/app/kubernetes/views/deploy/deployController.js
@@ -283,6 +283,12 @@ class KubernetesDeployController {
 
       this.Notifications.success('Success', 'Manifest successfully deployed');
       this.state.isEditorDirty = false;
+
+      if (this.$state.params.referrer) {
+        this.$state.go(this.$state.params.referrer);
+        return;
+      }
+
       this.$state.go('kubernetes.applications');
     } catch (err) {
       this.Notifications.error('Unable to deploy manifest', err, 'Unable to deploy resources');
diff --git a/app/react/kubernetes/ServicesView/ServicesDatatable/ServicesDatatable.tsx b/app/react/kubernetes/ServicesView/ServicesDatatable/ServicesDatatable.tsx
index 362419397..74dbb09f3 100644
--- a/app/react/kubernetes/ServicesView/ServicesDatatable/ServicesDatatable.tsx
+++ b/app/react/kubernetes/ServicesView/ServicesDatatable/ServicesDatatable.tsx
@@ -168,7 +168,7 @@ function TableActions({ selectedItems }: TableActionsProps) {
 
   return (
     <div className="servicesDatatable-actions">
-      <Authorized authorizations="K8sServiceW">
+      <Authorized authorizations="K8sServicesW">
         <Button
           className="btn-wrapper"
           color="dangerlight"
@@ -179,7 +179,11 @@ function TableActions({ selectedItems }: TableActionsProps) {
           Remove
         </Button>
 
-        <Link to="kubernetes.deploy" className="space-left">
+        <Link
+          to="kubernetes.deploy"
+          params={{ referrer: 'kubernetes.services' }}
+          className="space-left hover:no-decoration"
+        >
           <Button className="btn-wrapper" color="primary" icon="plus">
             Create from manifest
           </Button>
diff --git a/app/react/kubernetes/ingresses/IngressDatatable/IngressDatatable.tsx b/app/react/kubernetes/ingresses/IngressDatatable/IngressDatatable.tsx
index 0d67f69a4..f09b7e261 100644
--- a/app/react/kubernetes/ingresses/IngressDatatable/IngressDatatable.tsx
+++ b/app/react/kubernetes/ingresses/IngressDatatable/IngressDatatable.tsx
@@ -94,7 +94,11 @@ export function IngressDatatable() {
           </Link>
         </Authorized>
         <Authorized authorizations="K8sIngressesW">
-          <Link to="kubernetes.deploy" className="space-left no-decoration">
+          <Link
+            to="kubernetes.deploy"
+            className="space-left no-decoration"
+            params={{ referrer: 'kubernetes.ingresses' }}
+          >
             <Button icon={Plus} className="btn-wrapper">
               Create from manifest
             </Button>