diff --git a/files/js/files.js b/files/js/files.js
index 193c740b6c..4e1de1b04a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -63,10 +63,11 @@ $(document).ready(function() {
 			data: "dir="+$('#dir').val()+"&foldername="+$('#file_newfolder_name').val(),
 			complete: function(data){boolOperationFinished(data, function(){
 				var date=new Date();
-				FileList.addDir($('#file_newfolder_name').val(),0,date)
+				FileList.addDir($('#file_newfolder_name').val(),0,date);
+				$('#file_newfolder_name').val('New Folder');
+				$('#file_newfolder_name').blur();
 			});}
 		});
-		$('#file_newfolder_submit').fadeOut(250).trigger('vanish');
 	});
 	
 	$('#file_newfolder_name').click(function(){
@@ -75,20 +76,6 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#file_newfolder_name').bind('keyup', adjustNewFolderSize);
-	
-	$('#file_newfolder_submit').bind('vanish', function() {
-		$('#file_newfolder_name').bind('keyup', adjustNewFolderSize);
-		unsplitSize($('#file_newfolder_name'),$('#file_newfolder_submit'));
-	});
-	
-	$('#file_newfolder_name').focusout(function(){
-		if($('#file_newfolder_name').val() == '') {
-			$('#file_newfolder_form')[0].reset();
-			$('#file_newfolder_submit').fadeOut(250).trigger('vanish');
-		}
-	});
-	
 	$('.download').click('click',function(event) {
 		var files=getSelectedFiles('name').join(';');
 		
diff --git a/files/templates/index.php b/files/templates/index.php
index 336cca19cd..9bc939ee90 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -15,7 +15,6 @@
 		</form>
 		<form id="file_newfolder_form">
 			<input type="text" class="prettybutton" name="file_newfolder_name" id="file_newfolder_name" value="New Folder" />&nbsp;
-			<input class="prettybutton" type="submit" id="file_newfolder_submit" name="file_newfolder_submit" value="OK" />
 		</form>
 	</div>
 	<div id="file_action_panel">