diff --git a/ui/app/models/secret.js b/ui/app/models/secret.js
index 52010f857f..750f0e44f1 100644
--- a/ui/app/models/secret.js
+++ b/ui/app/models/secret.js
@@ -13,6 +13,12 @@ export default DS.Model.extend(KeyMixin, {
   renewable: attr('boolean'),
 
   secretData: attr('object'),
+  secretKeyAndValue: computed('secretData', function() {
+    const data = this.get('secretData');
+    return Object.keys(data).map(key => {
+      return { key, value: data[key] };
+    });
+  }),
 
   dataAsJSONString: computed('secretData', function() {
     return JSON.stringify(this.get('secretData'), null, 2);
diff --git a/ui/app/templates/partials/secret-form-show.hbs b/ui/app/templates/partials/secret-form-show.hbs
index c342675e15..a2bf10e0a6 100644
--- a/ui/app/templates/partials/secret-form-show.hbs
+++ b/ui/app/templates/partials/secret-form-show.hbs
@@ -46,10 +46,10 @@
         </div>
       </div>
     </div>
-    {{#each-in modelForData.secretData as |key value|}}
-      {{#info-table-row label=key value=value alwaysRender=true}}
-        {{masked-input value=value displayOnly=true allowCopy=true}}
+    {{#each modelForData.secretKeyAndValue as |secret|}}
+      {{#info-table-row label=secret.key value=secret.value alwaysRender=true}}
+        {{masked-input value=secret.value displayOnly=true allowCopy=true}}
       {{/info-table-row}}
-    {{/each-in}}
+    {{/each}}
   {{/if}}
 {{/if}}