diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index 87ae5ba1a..6e4981f3d 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -51,6 +51,13 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
   };
 
 
+  $scope.selectStorage = function (storage) {
+    $scope.useLocalstorage = storage == 'local';
+    $timeout(function() {
+      $scope.$digest();
+    }, 1);
+  };
+
   $scope.setStorage = function(useLocalstorage) {
     console.log('[createProfile.js.53:useLocalstorage:]', useLocalstorage); //TODO
     console.log('[createProfile.js.53:useLocalstorage:]', $scope.useLocalstorage); //TODO
diff --git a/views/createProfile.html b/views/createProfile.html
index ec8dcae57..e3e9df534 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -38,12 +38,11 @@
 
       <form ng-show="createStep == 'storage' " novalidate>
         <tabset>
-          <tab style="width: 50%;" ng-click="useLocalstorage=false">            
+          <tab style="width: 50%;" select="selectStorage('remote')">
             <tab-heading>
               <span class="text-bold">In the Cloud </span><br>
               <span class="size-10 text-gray">( Recommended )</span>
             </tab-heading>
-            <div ng-if="!useLocalstorage">
               <div class="content-item">
                 <div class="bg-circle"><i class="icon-wallet"></i>
                 </div>
@@ -59,14 +58,12 @@
                 </div>
                 <span class="text-gray">Email address confirmation needed</span>
               </div>
-            </div>
           </tab>
           
-          <tab style="width: 50%;" ng-click="useLocalstorage=true">
+          <tab style="width: 50%;" select="selectStorage('local')">
             <tab-heading>
               <div class="m5t text-bold">In this Device </div>
             </tab-heading>
-            <div ng-if="useLocalstorage">
               <div class="content-item">
                 <div class="bg-circle"><i class="icon-download"></i>
                 </div>
@@ -82,7 +79,6 @@
                 </div>
                 <span class="text-gray">Need to be careful with backups</span>
               </div>
-            </div>
           </tab>
         </tabset>