diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js
index aaa29de..9dbbb1c 100644
--- a/js/controllers/website-controller.js
+++ b/js/controllers/website-controller.js
@@ -348,7 +348,7 @@ app.controller('websiteCtrl', [
   };
   vm.Sites.upload = function (r) {
     if (r.uploadPath === undefined) {
-      r.uploadPath = vm.autoPopulateWebPath;
+      r.uploadPath = vm.breadcrumbsPath.join('');
     } else {
       r.uploadPath = vm.breadcrumbsPath.join('') + vm.autoPopulateWebPath;
     }
@@ -665,9 +665,8 @@ app.controller('websiteCtrl', [
             sites = _sites.concat(sites);
             return;
           }
-
-          console.error('_sites is not an array');
-          console.error(_sites);
+          // console.error('_sites is not an array');
+          // console.error(_sites);
         }, function (err) {
           console.error('_sites had an error');
           console.error(err);
diff --git a/templates/widgets/filetree.html b/templates/widgets/filetree.html
index f501a71..917b6f2 100644
--- a/templates/widgets/filetree.html
+++ b/templates/widgets/filetree.html
@@ -29,7 +29,7 @@
           <button type="button" name="button" class="btn btn-block btn-primary" ng-click="vm.showAction('invite');">Share folder</button>
           <ul class="ls-none folder-actions-list">
             <li class="" ng-hide="vm.showFolderAction"><span><i class="fa fa-upload cp"></i> <a ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false;" class="cp">Upload files</a></span></li>
-            <li class=""><span><i class="fa fa-folder cp"></i> <a ng-click="vm.cleanPath(); vm.showUploadFolderContainer = true;" class="cp">New folder</a></span></li>
+            <li class=""><span><i class="fa fa-folder cp"></i> <a ng-click="vm.cleanPath(); vm.showUploadFolderContainer = true; vm.showFileUploadBtn = false;" class="cp">New folder</a></span></li>
             <li ng-hide="vm.showUploadButton"><span><i class="fa fa-trash cp"></i> <a ng-click="vm.triggerDeleteFolder(vm.currentFolder, r)" data="{{ vm.currentFolder }}"  class="cp">Delete {{ vm.currentFolder | capitalize }} Folder</a></span></li>
           </ul>
         </div>