diff --git a/VERSION b/VERSION
index b2b88b6c..65e2fffd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.01.12.37.17
+Version 2.6.0-development+timestamp.2013.09.01.12.40.14
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 1cdc3dd4..6aefe163 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -1016,8 +1016,9 @@ def design():
     privates.sort()
 
     # Get all static files
+    MAXNFILES = 1000
     statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*')
-    statics = [x.replace('\\', '/') for x in statics]
+    statics = [x.replace('\\', '/') for x in statics[:MAXNFILES]]
     statics.sort()
 
     # Get all languages