diff --git a/public/views/create.html b/public/views/create.html
index e6333144a..31713598b 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -21,7 +21,7 @@
     </div>
   </div>
 
-  <div class="create-tab">
+  <div class="create-tab" ng-hide="create.hideTabs">
     <div class="tab-container">
     <a href 
       ng-class="{'selected': totalCopayers == 1}"
@@ -47,7 +47,7 @@
           <div class="large-12 columns" ng-hide="create.hideWalletName">
             <label><span translate>Wallet name</span>
               <div class="input">
-                <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" name="walletName" ng-model="walletName" ng-required="true" ng-blur="create.formFocus(false)">
+                <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" name="walletName" ng-model="walletName" ng-required="true" ng-focus="create.formFocus('wallet-name')" ng-blur="create.formFocus(false)">
               </div>
             </label>
           </div>
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 0aae93968..c696d487b 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -76,9 +76,14 @@ angular.module('copayApp.controllers').controller('createController',
 
       if (what && what == 'my-name') {
         this.hideWalletName = true;
+        this.hideTabs = true;
+      }
+      else if (what && what == 'wallet-name'){
+        this.hideTabs = true;
       }
       else {
         this.hideWalletName = false;
+        this.hideTabs = false;
       }
       $timeout(function() {
         $rootScope.$digest();