diff --git a/lua/diffview/config.lua b/lua/diffview/config.lua
index 86922fe1..fdbe91df 100644
--- a/lua/diffview/config.lua
+++ b/lua/diffview/config.lua
@@ -37,6 +37,7 @@ end
 M.defaults = {
   diff_binaries = false,
   enhanced_diff_hl = false,
+  gerrit_style_filesort = false,
   git_cmd = { "git" },
   hg_cmd = { "hg" },
   use_icons = true,
diff --git a/lua/diffview/ui/models/file_tree/node.lua b/lua/diffview/ui/models/file_tree/node.lua
index 3da6e0de..8930736b 100644
--- a/lua/diffview/ui/models/file_tree/node.lua
+++ b/lua/diffview/ui/models/file_tree/node.lua
@@ -1,3 +1,4 @@
+local config = require("diffview.config")
 local oop = require("diffview.oop")
 local utils = require("diffview.utils")
 local M = {}
@@ -52,6 +53,15 @@ end
 ---@return boolean true if node a comes before node b
 function Node.comparator(a, b)
   if a:has_children() == b:has_children() then
+    if config.get_config().gerrit_style_filesort and not a:has_children() then
+      cpp_header_suffixes = {".h", ".hh", ".hxx", ".hpp"}
+      a_name, a_ext = a.name:match("(.+)(%..+)$")
+      b_name, b_ext = b.name:match("(.+)(%..+)$")
+      if a_name == b_name then
+        if vim.tbl_contains(cpp_header_suffixes, a_ext) then return true end
+        if vim.tbl_contains(cpp_header_suffixes, b_ext) then return false end
+      end
+    end
     return string.lower(a.name) < string.lower(b.name)
   else
     return a:has_children()