diff --git a/VERSION b/VERSION
index 2f6edfbe..e637d7c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.06.14.32.32
+Version 2.6.0-development+timestamp.2013.09.06.15.17.26
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 927b2ea4..8e0120a1 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -563,7 +563,8 @@ def edit():
     app = get_app(request.vars.app)
     app_path = apath(app, r=request)
     editor_defaults={'theme':'web2py'}
-    config = Config(os.path.join(app_path, 'settings.cfg'), section='editor', default_values=editor_defaults)
+    config = Config(os.path.join(request.folder, 'settings.cfg'),
+                    section='editor', default_values=editor_defaults)
     preferences = config.read()
 
     if not(request.ajax):