diff --git a/ui/app/templates/partials/tools/unwrap.hbs b/ui/app/templates/partials/tools/unwrap.hbs
index 3987d9be5c5d..9ac78bc96409 100644
--- a/ui/app/templates/partials/tools/unwrap.hbs
+++ b/ui/app/templates/partials/tools/unwrap.hbs
@@ -11,10 +11,10 @@
     <nav class="tabs">
       <ul>
         <li role="tab" aria-selected={{if (eq unwrapActiveTab "data") "true" "false"}} class="{{if (eq unwrapActiveTab "data") "is-active"}}">
-          <button class="link link-plain tab has-text-weight-semibold" {{action (mut unwrapActiveTab)}}>Data</button>
+          <button class="link link-plain tab has-text-weight-semibold" {{action (mut unwrapActiveTab) "data"}} data-test-button-data>Data</button>
         </li>
         <li role="tab" aria-selected={{if (eq unwrapActiveTab "data") "true" "false"}} class="{{if (eq unwrapActiveTab "details") "is-active"}}">
-          <button class="link link-plain tab has-text-weight-semibold" {{action (mut unwrapActiveTab) "details"}}>Wrap Details</button>
+          <button class="link link-plain tab has-text-weight-semibold" {{action (mut unwrapActiveTab) "details"}} data-test-button-details>Wrap Details</button>
         </li>
       </ul>
     </nav>
@@ -75,6 +75,7 @@
           class="input"
           id="token"
           name="token"
+          autocomplete="off"
           data-test-tools-input="wrapping-token"
         }}
       </div>
diff --git a/ui/tests/acceptance/tools-test.js b/ui/tests/acceptance/tools-test.js
index 29c43589c1e5..39fc12105d85 100644
--- a/ui/tests/acceptance/tools-test.js
+++ b/ui/tests/acceptance/tools-test.js
@@ -82,6 +82,9 @@ module('Acceptance | tools', function(hooks) {
       JSON.parse(DATA_TO_WRAP),
       'unwrapped data equals input data'
     );
+    await click('[data-test-button-details]');
+    await click('[data-test-button-data]');
+    assert.dom('.CodeMirror').exists();
 
     //random
     await click('[data-test-tools-action-link="random"]');