diff --git a/src/view.js b/src/view.js
index 1e861a2..b6d206d 100644
--- a/src/view.js
+++ b/src/view.js
@@ -760,8 +760,8 @@ function UnlockPrivateKey() {
 
 function ExportEthereumKeystore() {
     var password = $("#keystore_pass").val();
-    configs.wallet.encrypt(password).then(function(data) {
-        dialog.showSaveDialog({defaultPath: configs.address.substring(0, 10)+'-keystore.json'},function (fileName) {
+    dialog.showSaveDialog({defaultPath: configs.address.substring(0, 10)+'-keystore.json'},function (fileName) {
+        configs.wallet.encrypt(password).then(function(data) {
             var stream = fs.createWriteStream(fileName);
             stream.once('open', function(fd) {
                 stream.write(data);
diff --git a/views/index.html b/views/index.html
index 5c43af0..55f9f0d 100644
--- a/views/index.html
+++ b/views/index.html
@@ -664,13 +664,13 @@ <h5>Export Wallet Data</h5>
                     <div class="col-6">
                         <h5>Export Keystore Wallet</h5>
                         One of the safest ways to store your Ethereum and Tokens. Private keys are not recommended! Use a Keystore file for maximum security.
-                        <form class="form-inline mt-3">
+                        <div class="form-inline mt-3">
                             <div class="form-group mx-sm-3 mb-2">
                                 <label for="inputPassword2" class="sr-only">New Password</label>
                                 <input type="password" class="form-control" id="keystore_pass" placeholder="Password">
                             </div>
                             <button type="submit" onclick="ExportEthereumKeystore()" class="btn btn-primary mb-2">Export</button>
-                        </form>
+                        </div>
 
                     </div>