diff --git a/ui/app/controllers/vault/cluster/secrets/backend/edit.js b/ui/app/controllers/vault/cluster/secrets/backend/edit.js
index 47bbcfa66..0b6356741 100644
--- a/ui/app/controllers/vault/cluster/secrets/backend/edit.js
+++ b/ui/app/controllers/vault/cluster/secrets/backend/edit.js
@@ -3,6 +3,11 @@ import BackendCrumbMixin from 'vault/mixins/backend-crumb';
 
 export default Controller.extend(BackendCrumbMixin, {
   backendController: controller('vault.cluster.secrets.backend'),
+  queryParams: ['version'],
+  version: '',
+  reset() {
+    this.set('version', '');
+  },
   actions: {
     refresh: function() {
       // closure actions don't bubble to routes,
diff --git a/ui/app/routes/vault/cluster/secrets/backend/edit.js b/ui/app/routes/vault/cluster/secrets/backend/edit.js
index 69b9f2e0b..1f4f74734 100644
--- a/ui/app/routes/vault/cluster/secrets/backend/edit.js
+++ b/ui/app/routes/vault/cluster/secrets/backend/edit.js
@@ -1,3 +1,9 @@
 import EditBase from './secret-edit';
 
-export default EditBase.extend();
+export default EditBase.extend({
+  queryParams: {
+    version: {
+      refreshModel: true,
+    },
+  },
+});
diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs
index 655721183..97adb5c73 100644
--- a/ui/app/templates/components/secret-edit.hbs
+++ b/ui/app/templates/components/secret-edit.hbs
@@ -55,11 +55,15 @@
   {{#if (and (eq mode 'show') canEdit)}}
     <div class="control">
       <LinkTo
-        @params={{array (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) model.id }}
+        @params={{array (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) model.id (if isV2 (query-params version=this.modelForData.version))}}
         @replace={{true}}
         class="link link-plain has-text-weight-semibold"
       >
-      Edit Secret
+      {{#if isV2}}
+        Create new version
+      {{else}}
+        Edit Secret
+      {{/if}}
       </LinkTo>
     </div>
   {{/if}}