diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index 0803ab3bb..f4b954f98 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -17,13 +17,13 @@
       <span translate>Scanning wallet funds...</span>
     </div>
   </div>
-  <div class="row">
-    <div class="large-12 medium-12 columns"> 
-      <div class="box-notification text-warning" ng-show="paperWallet.error">
-        <i class="fi-alert size-12"></i>
-        <span>{{paperWallet.error|translate}}</span>
-      </div>
-      <div ng-show="!paperWallet.balance" class="input">
+  <div class="box-notification text-warning" ng-show="paperWallet.error">
+    <i class="fi-alert size-12"></i>
+    <span>{{paperWallet.error|translate}}</span>
+  </div>
+  <div ng-show="!paperWallet.balance" class="row">
+    <div class="large-12 medium-12 columns">  
+      <div class="input">
         <label for="privateKey"><span>Paper Wallet Private Key</span></label>
         <input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="privateKey" id="privateKey">
         <div class="qr-scanner-input">
@@ -33,12 +33,21 @@
           <span translate>Passphrase (if you have one):</span>
         </label>
         <input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
-        <p ng-show="paperWallet.message" translate class="size-14 text-gray">{{paperWallet.message}}</p>
+        <p ng-show="paperWallet.isCordova" translate class="size-12 text-gray">
+          Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.
+        </p>
+        <button
+          ng-disabled="paperWallet.scanning || !privateKey"
+          ng-style="{'background-color':index.backgroundColor}" 
+          class="button black round expand" 
+          ng-click="paperWallet.createTx(privateKey, passphrase)" 
+          translate>Scan Wallet Funds
+        </button>
       </div> 
     </div>
   </div>
-  <div class="row">
-     <div class="large-12 medium-12 columns" ng-show="paperWallet.balance">
+  <div ng-show="paperWallet.balance" class="row">
+     <div class="large-12 medium-12 columns">
        <div class="text-center m20b">
          <h4 class="text-bold" translate>Funds founds</h4>
          <div class="size-24">
@@ -52,20 +61,11 @@
         ng-click="paperWallet.transaction()" 
         translate>sweep wallet
       </button>
-      <div class="m10t text-center">
+      <div class="text-center">
         <div class="size-12 text-gray" translate>Funds will be transfered to</div>
         <b>{{index.alias || index.walletName}}</b>
       </div>
     </div>
-    <div class="large-12 medium-12 columns"  ng-show="!paperWallet.balance" >
-      <button
-        ng-disabled="paperWallet.scanning || !privateKey"
-        ng-style="{'background-color':index.backgroundColor}" 
-        class="button black round expand" 
-        ng-click="paperWallet.createTx(privateKey, passphrase)" 
-        translate>Scan Wallet Funds
-      </button>               
-    </div>
   </div>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 2b5b83ab9..6caeb671f 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -1,9 +1,9 @@
 angular.module('copayApp.controllers').controller('paperWalletController',
-  function($scope, $http, $timeout, profileService, go, addressService) {
+  function($scope, $http, $timeout, profileService, go, addressService, isCordova) {
     self = this;
     var fc = profileService.focusedClient;
     var rawTx;
-    if (isCordova) self.message = "Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open."
+    self.isCordova = !isCordova;
 
     self.onQrCodeScanned = function(data) {
       $scope.privateKey = data;
@@ -82,4 +82,4 @@ angular.module('copayApp.controllers').controller('paperWalletController',
         rawtx: rawTx
       });
     };
-  });
\ No newline at end of file
+  });