diff --git a/files/js/files.js b/files/js/files.js
index be7e48aeee..d3f91fe9a2 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -69,6 +69,7 @@ $(document).ready(function() {
 				$('#file_newfolder_name').blur();
 			});}
 		});
+		$('#emptyfolder').remove();
 	});
 	
 	$('#file_newfolder_name').click(function(){
@@ -181,6 +182,7 @@ $(document).ready(function() {
 			clone.insertBefore(form);
 			form.hide();
 		}
+		$('#emptyfolder').remove();
 	});
 	
 	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
@@ -433,4 +435,4 @@ function getMimeIcon(mime){
 		mime='file';
 	}
 	return OC.imagePath('core','mimetypes/'+mime+'.png');
-}
\ No newline at end of file
+}
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 3713d483b0..4058666432 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,4 +1,4 @@
-		<?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!</span><style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style>';
+		<?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!<style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style></span>';
 		foreach($_['files'] as $file):
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = 200-intval($file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey