diff --git a/lib/files.php b/lib/files.php
index d052116842..594b96a9c5 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -79,8 +79,8 @@ class OC_FILES {
 			closedir($dh);
 			}
 		}
-		ksort($dirs);
-		ksort($files);
+		uksort($dirs, "strnatcasecmp");
+		uksort($files, "strnatcasecmp");
 		$content=array_merge($dirs,$files);
 		if($filesfound){
 			return $content;
@@ -401,4 +401,4 @@ class fakeDirStream{
 	}
 }
 stream_wrapper_register("fakedir", "fakeDirStream");
-?>
\ No newline at end of file
+?>