diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 7146fe78e..80f51ea37 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -265,7 +265,7 @@ switch($command) {
 
 	case 'movefolder': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movefolder', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -304,7 +304,7 @@ switch($command) {
 
 	case 'movedocument': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movedocument', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -343,7 +343,7 @@ switch($command) {
 
 	case 'transfercontent': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movedocument', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -394,7 +394,7 @@ switch($command) {
 
 	case 'linkdocument': /* {{{ */
 		if($user) {
-			if(!checkFormKey('movedocument', 'GET')) {
+			if(!checkFormKey('', 'GET')) {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
@@ -607,7 +607,7 @@ switch($command) {
 
 	case 'uploaddocument': /* {{{ */
 		if($user) {
-			if(checkFormKey('adddocument')) {
+			if(checkFormKey('')) {
 				if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
 					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index d1b5f96df..5d22b958a 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -661,6 +661,7 @@ function onAddClipboard(ev) { /* {{{ */
 					fd.append('command', 'uploaddocument');
 //					fd.append('path', files[i].webkitRelativePath);
 
+					statusbar.parent().show();
 					var status = new createStatusbar(statusbar);
 					status.setFileNameSize(files[i].name,files[i].size);
 					sendFileToServer(fd,status);
@@ -725,7 +726,7 @@ $(document).ready(function() { /* {{{ */
 		var files = e.originalEvent.dataTransfer.files;
 
 		//We need to send dropped files to Server
-		SeedDMSUpload.handleFileUpload(files,obj,obj);
+		SeedDMSUpload.handleFileUpload(files,obj, obj);
 	});
 
 	$(document).on('dragenter', '.droptarget', function (e) {
@@ -753,7 +754,7 @@ $(document).ready(function() { /* {{{ */
 			var files = e.originalEvent.dataTransfer.files;
 			if(files.length > 0) {
 				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
-				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span"));
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
 			} else {
 				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
 				source_type = source_info.type;
@@ -848,7 +849,7 @@ $(document).ready(function() { /* {{{ */
 			var files = e.originalEvent.dataTransfer.files;
 			if(files.length > 0) {
 				console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
-				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span"));
+				SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$('div.statusbar-container h1')/*$(e.currentTarget).find("span")*/);
 			} else {
 				var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
 				source_type = source_info.type;
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index cb9b409f3..c9d93165e 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -390,7 +390,7 @@ $('#loadmore').click(function(e) {
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");");
 //			$this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');");
 ?>
-<div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div>
+<div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
 <?php
 			echo "</div>";
 			echo "</div>";