From fc1297bf6ecea1b09de499c64c0c1b12ed5d4e56 Mon Sep 17 00:00:00 2001
From: hc-github-team-secure-vault-core
 <82990506+hc-github-team-secure-vault-core@users.noreply.github.com>
Date: Wed, 23 Aug 2023 19:07:53 -0400
Subject: [PATCH] Backport of UI: Fix blank secret on KV create > cancel

Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
---
 changelog/22541.txt                                        | 3 +++
 ui/app/routes/vault/cluster/secrets/backend/secret-edit.js | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 changelog/22541.txt

diff --git a/changelog/22541.txt b/changelog/22541.txt
new file mode 100644
index 0000000000..918af3eac1
--- /dev/null
+++ b/changelog/22541.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fix blank page or ghost secret when canceling KV secret create
+```
diff --git a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
index 90cbf8c8ed..1e24320545 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js
@@ -342,6 +342,7 @@ export default Route.extend(UnloadModelRoute, {
           )
         ) {
           version && version.rollbackAttributes();
+          model && model.rollbackAttributes();
           this.unloadModel();
           return true;
         } else {