diff --git a/src/Models/Change.cs b/src/Models/Change.cs
index baf6e8500..013dd49ce 100644
--- a/src/Models/Change.cs
+++ b/src/Models/Change.cs
@@ -7,6 +7,12 @@ public enum ChangeViewMode
         Tree,
     }
 
+    public enum ChangeSortMode
+    {
+        Path,
+        Status,
+    }
+
     public enum ChangeState
     {
         None,
@@ -79,6 +85,48 @@ public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
                 OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2);
         }
 
+        /// <summary>
+        /// Gets the sort priority for a change based on its status, used for sorting changes by status.
+        /// Lower numbers indicate higher priority (appear first in sorted lists).
+        /// </summary>
+        /// <param name="change">The change object to get priority for</param>
+        /// <param name="isUnstagedContext">True if sorting in unstaged context, false for staged context</param>
+        /// <returns>Priority value where lower numbers appear first</returns>
+        public static int GetStatusSortPriority(Change change, bool isUnstagedContext)
+        {
+            if (change == null) return int.MaxValue;
+
+            if (isUnstagedContext)
+            {
+                // For unstaged context, only consider WorkTree state
+                return change.WorkTree switch
+                {
+                    ChangeState.Conflicted => 1,   // Conflicts first - most urgent
+                    ChangeState.Modified => 2,
+                    ChangeState.TypeChanged => 3,
+                    ChangeState.Deleted => 4,      // Missing files
+                    ChangeState.Renamed => 5,
+                    ChangeState.Copied => 6,
+                    ChangeState.Untracked => 7,    // New files last
+                    _ => 10
+                };
+            }
+            else
+            {
+                // For staged context, only consider Index state
+                return change.Index switch
+                {
+                    ChangeState.Modified => 1,
+                    ChangeState.TypeChanged => 2,
+                    ChangeState.Renamed => 3,
+                    ChangeState.Copied => 4,
+                    ChangeState.Added => 5,
+                    ChangeState.Deleted => 6,
+                    _ => 10
+                };
+            }
+        }
+
         private static readonly string[] TYPE_DESCS =
         [
             "Unknown",
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 6da606aee..b70316335 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -103,6 +103,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Zeige als Datei- und Ordnerliste</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Zeige als Pfadliste</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Zeige als Dateisystem-Baumstruktur</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Nach Pfad sortieren</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Nach Status sortieren</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Ändere URL des Submoduls</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Submodul:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index c997f8221..8c2155d0f 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -108,6 +108,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Show as File and Dir List</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Show as Path List</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Show as Filesystem Tree</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Sort by Path</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Sort by Status</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Change Submodule's URL</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Submodule:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 5f374f093..3fb8e2ac7 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -112,6 +112,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostrar como Lista de Archivos y Directorios</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Mostrar como Lista de Rutas</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostrar como Árbol de Sistema de Archivos</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Ordenar por ruta</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Ordenar por estado</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Cambiar la URL del Submódulo</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Submódulo:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 8227387c9..ec0165f5e 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -107,6 +107,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Afficher comme liste de dossiers/fichiers</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Afficher comme liste de chemins</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Afficher comme arborescence</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Trier par chemin</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Trier par statut</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Changer l'URL du sous-module</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Sous-module :</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL :</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 13122e41c..84a5eb13d 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -102,6 +102,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Mostra come elenco di file e cartelle</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Mostra come elenco di percorsi</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Mostra come albero del filesystem</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Ordina per percorso</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Ordina per stato</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Cambia l'URL del Sottomodulo</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Sottomodulo:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 7f2341eb6..d84e6e08b 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -112,6 +112,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">ファイルとディレクトリの一覧で表示</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">パスの一覧で表示</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">ファイルシステムのツリーで表示</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">パスで並び替え</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">ステータスで並び替え</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">サブモジュールの URL を変更</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">サブモジュール:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 8155dc647..33059aa28 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -93,6 +93,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Exibir como Lista de Arquivos e Diretórios</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Exibir como Lista de Caminhos</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Exibir como Árvore de Sistema de Arquivos</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Ordenar por caminho</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Ordenar por status</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index ee438ac49..f24bc99f8 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -112,6 +112,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Показывать в виде списка файлов и каталогов</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Показывать в виде списка путей</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Показывать в виде дерева файловой системы</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">Сортировать по пути</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">Сортировать по статусу</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">Изменить URL-адрес подмодуля</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">Подмодуль:</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL-адрес:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cf27832e7..060d8de07 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -112,6 +112,8 @@
   <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">文件名+路径列表模式</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">全路径列表模式</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">文件目录树形结构模式</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Path" xml:space="preserve">按路径排序</x:String>
+  <x:String x:Key="Text.ChangeSortMode.Status" xml:space="preserve">按状态排序</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">修改子模块远程地址</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">子模块 ：</x:String>
   <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">远程地址 ：</x:String>
diff --git a/src/ViewModels/ChangeTreeNode.cs b/src/ViewModels/ChangeTreeNode.cs
index c35f4fc1f..edd355f7b 100644
--- a/src/ViewModels/ChangeTreeNode.cs
+++ b/src/ViewModels/ChangeTreeNode.cs
@@ -48,7 +48,7 @@ public ChangeTreeNode(string path, bool isExpanded)
             IsExpanded = isExpanded;
         }
 
-        public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded, bool compactFolders)
+        public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded, Models.ChangeSortMode sortMode = Models.ChangeSortMode.Path, bool isUnstagedContext = false, bool compactFolders = false)
         {
             var nodes = new List<ChangeTreeNode>();
             var folders = new Dictionary<string, ChangeTreeNode>();
@@ -98,7 +98,7 @@ public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<s
                     Compact(node);
             }
 
-            SortAndSetDepth(nodes, 0);
+            Sort(nodes, sortMode, isUnstagedContext);
 
             folders.Clear();
             return nodes;
@@ -142,21 +142,49 @@ private static void Compact(ChangeTreeNode node)
             Compact(node);
         }
 
-        private static void SortAndSetDepth(List<ChangeTreeNode> nodes, int depth)
+        private static void Sort(List<ChangeTreeNode> nodes, Models.ChangeSortMode sortMode, bool isUnstagedContext, int depth = 0)
         {
             foreach (var node in nodes)
             {
                 node.Depth = depth;
                 if (node.IsFolder)
-                    SortAndSetDepth(node.Children, depth + 1);
+                    Sort(node.Children, sortMode, isUnstagedContext, depth + 1);
             }
 
-            nodes.Sort((l, r) =>
+            if (sortMode == Models.ChangeSortMode.Status)
             {
-                if (l.IsFolder == r.IsFolder)
+                nodes.Sort((l, r) =>
+                {
+                    // Sort folders first
+                    if (l.IsFolder != r.IsFolder)
+                        return l.IsFolder ? -1 : 1;
+
+                    // If both are folders, sort by path
+                    if (l.IsFolder && r.IsFolder)
+                        return Models.NumericSort.Compare(l.DisplayName, r.DisplayName);
+
+                    // For files, sort by status first
+                    var leftPriority = Models.Change.GetStatusSortPriority(l.Change, isUnstagedContext);
+                    var rightPriority = Models.Change.GetStatusSortPriority(r.Change, isUnstagedContext);
+                    
+                    // First sort by status priority
+                    var statusComparison = leftPriority.CompareTo(rightPriority);
+                    if (statusComparison != 0)
+                        return statusComparison;
+
+                    // If status priorities are equal, sort by path as secondary sort
                     return Models.NumericSort.Compare(l.DisplayName, r.DisplayName);
-                return l.IsFolder ? -1 : 1;
-            });
+                });
+            }
+            else
+            {
+                nodes.Sort((l, r) =>
+                {
+                    if (l.IsFolder == r.IsFolder)
+                        return Models.NumericSort.Compare(l.DisplayName, r.DisplayName);
+                    return l.IsFolder ? -1 : 1;
+                });
+            }
         }
 
         private bool _isExpanded = true;
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index ce0942d4c..b18fbb00d 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -331,6 +331,30 @@ public Models.ChangeViewMode StashChangeViewMode
             set => SetProperty(ref _stashChangeViewMode, value);
         }
 
+        public Models.ChangeSortMode UnstagedChangeSortMode
+        {
+            get => _unstagedChangeSortMode;
+            set => SetProperty(ref _unstagedChangeSortMode, value);
+        }
+
+        public Models.ChangeSortMode StagedChangeSortMode
+        {
+            get => _stagedChangeSortMode;
+            set => SetProperty(ref _stagedChangeSortMode, value);
+        }
+
+        public Models.ChangeSortMode CommitChangeSortMode
+        {
+            get => _commitChangeSortMode;
+            set => SetProperty(ref _commitChangeSortMode, value);
+        }
+
+        public Models.ChangeSortMode StashChangeSortMode
+        {
+            get => _stashChangeSortMode;
+            set => SetProperty(ref _stashChangeSortMode, value);
+        }
+
         public string GitInstallPath
         {
             get => Native.OS.GitExecutable;
@@ -838,6 +862,11 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private Models.ChangeViewMode _commitChangeViewMode = Models.ChangeViewMode.List;
         private Models.ChangeViewMode _stashChangeViewMode = Models.ChangeViewMode.List;
 
+        private Models.ChangeSortMode _unstagedChangeSortMode = Models.ChangeSortMode.Path;
+        private Models.ChangeSortMode _stagedChangeSortMode = Models.ChangeSortMode.Path;
+        private Models.ChangeSortMode _commitChangeSortMode = Models.ChangeSortMode.Path;
+        private Models.ChangeSortMode _stashChangeSortMode = Models.ChangeSortMode.Path;
+
         private string _gitDefaultCloneDir = string.Empty;
         private int _shellOrTerminalType = -1;
     }
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 8cf0a32ce..8243a937b 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -114,6 +114,18 @@ public Models.ChangeViewMode ViewMode
             set => SetAndRaise(ViewModeProperty, ref _viewMode, value);
         }
 
+        public static readonly DirectProperty<ChangeCollectionView, Models.ChangeSortMode> SortModeProperty =
+            AvaloniaProperty.RegisterDirect<ChangeCollectionView, Models.ChangeSortMode>(
+                nameof(SortMode),
+                static o => o.SortMode,
+                static (o, v) => o.SortMode = v);
+
+        public Models.ChangeSortMode SortMode
+        {
+            get => _sortMode;
+            set => SetAndRaise(SortModeProperty, ref _sortMode, value);
+        }
+
         public static readonly DirectProperty<ChangeCollectionView, bool> EnableCompactFoldersProperty =
             AvaloniaProperty.RegisterDirect<ChangeCollectionView, bool>(
                 nameof(EnableCompactFolders),
@@ -237,12 +249,12 @@ public Models.Change GetNextChangeWithoutSelection()
                 if (lastUnselected != -1)
                     return tree.Rows[lastUnselected].Change;
             }
-            else
+            else if (Content is ViewModels.ChangeCollectionAsGrid grid)
             {
                 var lastUnselected = -1;
-                for (int i = changes.Count - 1; i >= 0; i--)
+                for (int i = grid.Changes.Count - 1; i >= 0; i--)
                 {
-                    if (set.Contains(changes[i].Path))
+                    if (set.Contains(grid.Changes[i].Path))
                     {
                         if (lastUnselected == -1)
                             continue;
@@ -254,7 +266,26 @@ public Models.Change GetNextChangeWithoutSelection()
                 }
 
                 if (lastUnselected != -1)
-                    return changes[lastUnselected];
+                    return grid.Changes[lastUnselected];
+            }
+            else if (Content is ViewModels.ChangeCollectionAsList list)
+            {
+                var lastUnselected = -1;
+                for (int i = list.Changes.Count - 1; i >= 0; i--)
+                {
+                    if (set.Contains(list.Changes[i].Path))
+                    {
+                        if (lastUnselected == -1)
+                            continue;
+
+                        break;
+                    }
+
+                    lastUnselected = i;
+                }
+
+                if (lastUnselected != -1)
+                    return list.Changes[lastUnselected];
             }
 
             return null;
@@ -273,6 +304,8 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
             if (change.Property == ViewModeProperty)
                 UpdateDataSource(true);
+            else if (change.Property == SortModeProperty)
+                UpdateDataSource(true);
             else if (change.Property == ChangesProperty)
                 UpdateDataSource(false);
             else if (change.Property == SelectedChangesProperty)
@@ -412,7 +445,7 @@ private void UpdateDataSource(bool onlyViewModeChange)
                 }
 
                 var tree = new ViewModels.ChangeCollectionAsTree();
-                tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded, EnableCompactFolders);
+                tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded, SortMode, IsUnstagedChange, EnableCompactFolders);
 
                 var rows = new List<ViewModels.ChangeTreeNode>();
                 MakeTreeRows(rows, tree.Tree);
@@ -436,7 +469,8 @@ private void UpdateDataSource(bool onlyViewModeChange)
             else if (ViewMode == Models.ChangeViewMode.Grid)
             {
                 var grid = new ViewModels.ChangeCollectionAsGrid();
-                grid.Changes.AddRange(changes);
+                var sortedChanges = SortChanges(changes, SortMode);
+                grid.Changes.AddRange(sortedChanges);
                 if (selected.Count > 0)
                     grid.SelectedChanges.AddRange(selected);
 
@@ -445,7 +479,8 @@ private void UpdateDataSource(bool onlyViewModeChange)
             else
             {
                 var list = new ViewModels.ChangeCollectionAsList();
-                list.Changes.AddRange(changes);
+                var sortedChanges = SortChanges(changes, SortMode);
+                list.Changes.AddRange(sortedChanges);
                 if (selected.Count > 0)
                     list.SelectedChanges.AddRange(selected);
 
@@ -524,8 +559,38 @@ private void UpdateRowTips(Control control, Models.Change change)
             ToolTip.SetTip(control, tip);
         }
 
+        private List<Models.Change> SortChanges(List<Models.Change> changes, Models.ChangeSortMode sortMode)
+        {
+            var sortedChanges = new List<Models.Change>(changes);
+
+            if (sortMode == Models.ChangeSortMode.Status)
+            {
+                sortedChanges.Sort((l, r) =>
+                {
+                    var leftPriority = Models.Change.GetStatusSortPriority(l, IsUnstagedChange);
+                    var rightPriority = Models.Change.GetStatusSortPriority(r, IsUnstagedChange);
+                    
+                    // First sort by status priority
+                    var statusComparison = leftPriority.CompareTo(rightPriority);
+                    if (statusComparison != 0)
+                        return statusComparison;
+
+                    // If status priorities are equal, sort by path as secondary sort
+                    // Use the same sorting logic as the path-only sort for consistency
+                    return Models.NumericSort.Compare(l.Path, r.Path);
+                });
+            }
+            else
+            {
+                // Path sort mode - use NumericSort for consistency
+                sortedChanges.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
+            }
+            return sortedChanges;
+        }
+
         private bool _isUnstagedChange = false;
         private Models.ChangeViewMode _viewMode = Models.ChangeViewMode.Tree;
+        private Models.ChangeSortMode _sortMode = Models.ChangeSortMode.Path;
         private bool _enableCompactFolders = false;
         private List<Models.Change> _changes = null;
         private List<Models.Change> _selectedChanges = null;
diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml
index b72fcbcb8..31c19fb9e 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml
+++ b/src/Views/ChangeViewModeSwitcher.axaml
@@ -24,6 +24,17 @@
             <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
           </MenuItem.Icon>
         </MenuItem>
+        <Separator/>
+        <MenuItem Header="{DynamicResource Text.ChangeSortMode.Path}" Click="SortByPath">
+          <MenuItem.Icon>
+            <Path Width="12" Height="12" Data="{StaticResource Icons.Check}" IsVisible="{Binding #ThisControl.SortMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeSortMode.Path}}"/>
+          </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Header="{DynamicResource Text.ChangeSortMode.Status}" Click="SortByStatus">
+          <MenuItem.Icon>
+            <Path Width="12" Height="12" Data="{StaticResource Icons.Check}" IsVisible="{Binding #ThisControl.SortMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeSortMode.Status}}"/>
+          </MenuItem.Icon>
+        </MenuItem>
       </MenuFlyout>
     </Button.Flyout>
 
diff --git a/src/Views/ChangeViewModeSwitcher.axaml.cs b/src/Views/ChangeViewModeSwitcher.axaml.cs
index a51eccefd..e31152812 100644
--- a/src/Views/ChangeViewModeSwitcher.axaml.cs
+++ b/src/Views/ChangeViewModeSwitcher.axaml.cs
@@ -18,6 +18,18 @@ public Models.ChangeViewMode ViewMode
             set => SetAndRaise(ViewModeProperty, ref _viewMode, value);
         }
 
+        public static readonly DirectProperty<ChangeViewModeSwitcher, Models.ChangeSortMode> SortModeProperty =
+            AvaloniaProperty.RegisterDirect<ChangeViewModeSwitcher, Models.ChangeSortMode>(
+                nameof(SortMode),
+                static o => o.SortMode,
+                static (o, v) => o.SortMode = v);
+
+        public Models.ChangeSortMode SortMode
+        {
+            get => _sortMode;
+            set => SetAndRaise(SortModeProperty, ref _sortMode, value);
+        }
+
         public ChangeViewModeSwitcher()
         {
             InitializeComponent();
@@ -41,6 +53,19 @@ private void SwitchToTree(object sender, RoutedEventArgs e)
             e.Handled = true;
         }
 
+        private void SortByPath(object sender, RoutedEventArgs e)
+        {
+            SortMode = Models.ChangeSortMode.Path;
+            e.Handled = true;
+        }
+
+        private void SortByStatus(object sender, RoutedEventArgs e)
+        {
+            SortMode = Models.ChangeSortMode.Status;
+            e.Handled = true;
+        }
+
         private Models.ChangeViewMode _viewMode = Models.ChangeViewMode.List;
+        private Models.ChangeSortMode _sortMode = Models.ChangeSortMode.Path;
     }
 }
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index d7d245ccf..c180bb507 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -41,12 +41,14 @@
         <v:ChangeViewModeSwitcher Grid.Column="1"
                                   Width="18" Height="18"
                                   Margin="4,0,0,0"
-                                  ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                  ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"
+                                  SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode, Mode=TwoWay}"/>
       </Grid>
 
       <!-- Changes -->
       <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
         <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+                                SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
index 3f340d495..c6789d539 100644
--- a/src/Views/Compare.axaml
+++ b/src/Views/Compare.axaml
@@ -172,12 +172,14 @@
             <v:ChangeViewModeSwitcher Grid.Column="1"
                                       Width="14" Height="14"
                                       HorizontalAlignment="Right"
-                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"
+                                      SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode, Mode=TwoWay}"/>
           </Grid>
 
           <!-- Changes -->
           <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
             <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+                                    SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode}"
                                     EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 5452a4e5e..5d797fef7 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -102,12 +102,14 @@
           <v:ChangeViewModeSwitcher Grid.Column="1"
                                     Width="14" Height="14"
                                     HorizontalAlignment="Right"
-                                    ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
+                                    ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"
+                                    SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode, Mode=TwoWay}"/>
         </Grid>
 
         <!-- Changes -->
         <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
           <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+                                  SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeSortMode}"
                                   EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                   Changes="{Binding VisibleChanges}"
                                   SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index ad9dc6eb9..4eeb89e07 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -123,13 +123,15 @@
           <v:ChangeViewModeSwitcher Grid.Column="2"
                                     Width="26" Height="14"
                                     Margin="0,1,0,0"
-                                    ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StashChangeViewMode, Mode=TwoWay}"/>
+                                    ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StashChangeViewMode, Mode=TwoWay}"
+                                    SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StashChangeSortMode, Mode=TwoWay}"/>
         </Grid>
       </Border>
 
       <!-- View Changes -->
       <Border Grid.Row="4" Background="{DynamicResource Brush.Contents}">
         <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StashChangeViewMode, Mode=OneWay}"
+                                SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StashChangeSortMode, Mode=OneWay}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding Changes}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 4275460c4..dbe2ba2b4 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -119,7 +119,8 @@
             <v:ChangeViewModeSwitcher Grid.Column="9"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
-                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"
+                                      SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeSortMode, Mode=TwoWay}"/>
           </Grid>
         </Border>
 
@@ -129,6 +130,7 @@
                                 IsUnstagedChange="True"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode}"
+                                SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeSortMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding VisibleUnstaged}"
                                 SelectedChanges="{Binding SelectedUnstaged, Mode=TwoWay}"
@@ -174,7 +176,8 @@
             <v:ChangeViewModeSwitcher Grid.Column="6"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
-                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>
+                                      ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"
+                                      SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeSortMode, Mode=TwoWay}"/>
           </Grid>
         </Border>
 
@@ -184,6 +187,7 @@
                                 IsUnstagedChange="False"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode}"
+                                SortMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeSortMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding VisibleStaged}"
                                 SelectedChanges="{Binding SelectedStaged, Mode=TwoWay}"