diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
index 15086e89ba..b6d6e7ed6a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
@@ -278,7 +278,7 @@ public class GitBrowseCommand extends AbstractGitCommand
         convertToFileObject(fileObject, repo, request, revId, entry.getChildren());
       }
 
-      if (resultCount > request.getOffset() || fileObject.isDirectory()) {
+      if (resultCount > request.getOffset() || (request.getOffset() == 0 && fileObject.isDirectory())) {
         files.add(fileObject);
       }
     }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
index 48e7a6e9ff..0bef6d951b 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
@@ -280,7 +280,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
 
     Collection<FileObject> foList = root.getChildren();
 
-    assertThat(foList).extracting("name").contains("f.txt");
+    assertThat(foList).extracting("name").containsExactly("f.txt");
     assertFalse("result should not be marked as trunctated", root.isTruncated());
   }
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
index 274155fd55..c362e628a4 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
@@ -136,15 +136,18 @@ public class SvnBrowseCommand extends AbstractSvnCommand
     List<SVNDirEntry> entries = new ArrayList<>(svnRepository.getDir(parent.getPath(), revisionNumber, null, (Collection) null));
     sort(entries, entry -> entry.getKind() == SVNNodeKind.DIR, SVNDirEntry::getName);
     for (Iterator<SVNDirEntry> iterator = entries.iterator(); resultCount < request.getLimit() + request.getOffset() && iterator.hasNext(); ) {
-      ++resultCount;
       SVNDirEntry entry = iterator.next();
       FileObject child = createFileObject(request, svnRepository, revisionNumber, entry, basePath);
 
+      if (!child.isDirectory()) {
+        ++resultCount;
+      }
+
       if (child.isDirectory() && request.isRecursive()) {
         traverse(svnRepository, revisionNumber, request, child, createBasePath(child.getPath()));
       }
 
-      if (resultCount > request.getOffset()) {
+      if (resultCount > request.getOffset() || (request.getOffset() == 0 && child.isDirectory())) {
         parent.addChild(child);
       }
     }
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
index f0bdb38c4a..6ddebf0bf9 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
@@ -189,7 +189,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
 
     Collection<FileObject> foList = result.getFile().getChildren();
 
-    assertThat(foList).extracting("name").containsExactly("c");
+    assertThat(foList).extracting("name").containsExactly("c", "a.txt");
     assertThat(result.getFile().isTruncated()).isTrue();
   }
 
@@ -203,7 +203,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
 
     Collection<FileObject> foList = result.getFile().getChildren();
 
-    assertThat(foList).extracting("name").containsExactly("a.txt");
+    assertThat(foList).isEmpty();
   }
 
   @Test
@@ -233,7 +233,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
   public void testRecursiveLimitInSubDir() throws IOException {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
-    request.setLimit(2);
+    request.setLimit(1);
     request.setRecursive(true);
 
     FileObject root = createCommand().getBrowserResult(request).getFile();
@@ -256,7 +256,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
   public void testRecursiveOffset() throws IOException {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
-    request.setOffset(2);
+    request.setOffset(1);
     request.setRecursive(true);
 
     FileObject root = createCommand().getBrowserResult(request).getFile();