diff --git a/ui/app/models/key-mixin.js b/ui/app/mixins/key-mixin.js
similarity index 100%
rename from ui/app/models/key-mixin.js
rename to ui/app/mixins/key-mixin.js
diff --git a/ui/app/models/lease.js b/ui/app/models/lease.js
index bbf271ad62..73d299065e 100644
--- a/ui/app/models/lease.js
+++ b/ui/app/models/lease.js
@@ -1,6 +1,6 @@
 import { match } from '@ember/object/computed';
 import DS from 'ember-data';
-import KeyMixin from './key-mixin';
+import KeyMixin from 'vault/mixins/key-mixin';
 const { attr } = DS;
 
 /* sample response
diff --git a/ui/app/models/secret-v2.js b/ui/app/models/secret-v2.js
index 89648e1900..fa1226bfe6 100644
--- a/ui/app/models/secret-v2.js
+++ b/ui/app/models/secret-v2.js
@@ -2,10 +2,11 @@ import DS from 'ember-data';
 import { computed } from '@ember/object';
 import { match } from '@ember/object/computed';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
+import KeyMixin from 'vault/mixins/key-mixin';
 
 const { attr, hasMany, belongsTo, Model } = DS;
 
-export default Model.extend({
+export default Model.extend(KeyMixin, {
   engine: belongsTo('secret-engine'),
   versions: hasMany('secret-v2-version', { async: false, inverse: null }),
   selectedVersion: belongsTo('secret-v2-version', { async: false, inverse: 'secret' }),
@@ -23,7 +24,6 @@ export default Model.extend({
     helpText:
       'Writes will only be allowed if the key’s current version matches the version specified in the cas parameter',
   }),
-  isFolder: match('id', /\/$/),
   fields: computed(function() {
     return expandAttributeMeta(this, ['maxVersions', 'casRequired']);
   }),
diff --git a/ui/app/models/secret.js b/ui/app/models/secret.js
index 4e1e7abcb2..3e4174ebb4 100644
--- a/ui/app/models/secret.js
+++ b/ui/app/models/secret.js
@@ -1,6 +1,6 @@
 import { computed } from '@ember/object';
 import DS from 'ember-data';
-import KeyMixin from './key-mixin';
+import KeyMixin from 'vault/mixins/key-mixin';
 const { attr } = DS;
 
 export default DS.Model.extend(KeyMixin, {
@@ -21,5 +21,6 @@ export default DS.Model.extend(KeyMixin, {
   }),
 
   helpText: attr('string'),
+  // TODO this needs to be a relationship like `engine` on kv-v2
   backend: attr('string'),
 });