diff --git a/scm-core/src/main/java/sonia/scm/repository/FileObjectNameComparator.java b/scm-core/src/main/java/sonia/scm/repository/FileObjectNameComparator.java
new file mode 100644
index 0000000000..d059419830
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/FileObjectNameComparator.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.repository;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.util.Util;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Comparator;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class FileObjectNameComparator implements Comparator<FileObject>
+{
+
+  /** Field description */
+  public static FileObjectNameComparator instance =
+    new FileObjectNameComparator();
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param o1
+   * @param o2
+   *
+   * @return
+   */
+  @Override
+  public int compare(FileObject o1, FileObject o2)
+  {
+    int result = 0;
+
+    if (o1.isDirectory() &&!o2.isDirectory())
+    {
+      result = -1;
+    }
+    else if (!o1.isDirectory() && o2.isDirectory())
+    {
+      result = 1;
+    }
+    else
+    {
+      result = Util.compare(o1.getName(), o2.getName());
+    }
+
+    return result;
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
index 5bd379311d..e0c5928c3d 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -48,6 +48,8 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.ChangesetPreProcessor;
 import sonia.scm.repository.ChangesetViewer;
+import sonia.scm.repository.FileObject;
+import sonia.scm.repository.FileObjectNameComparator;
 import sonia.scm.repository.Permission;
 import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.PermissionUtil;
@@ -64,6 +66,8 @@ import sonia.scm.web.security.WebSecurityContext;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -157,6 +161,7 @@ public class RepositoryResource
         if (browser != null)
         {
           result = browser.getResult(revision, path);
+          sort(result);
         }
         else if (logger.isWarnEnabled())
         {
@@ -394,6 +399,27 @@ public class RepositoryResource
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param result
+   */
+  private void sort(BrowserResult result)
+  {
+    FileObject file = result.getFile();
+
+    if (file != null)
+    {
+      List<FileObject> children = file.getChildren();
+
+      if (children != null)
+      {
+        Collections.sort(children, FileObjectNameComparator.instance);
+      }
+    }
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
index 0092f1046c..833d923a5c 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
@@ -69,7 +69,8 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, {
         dataIndex: 'name',
         header: 'Name',
         renderer: this.renderName,
-        scope: this
+        scope: this,
+        width: 180
       },{
         id: 'length',
         dataIndex: 'length',
@@ -78,7 +79,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, {
       },{
         id: 'lastModified',
         dataIndex: 'lastModified',
-        header: 'LastModified',
+        header: 'Last Modified',
         renderer: Ext.util.Format.formatTimestamp
       },{
         id: 'description',