diff --git a/RetroBar/App.xaml.cs b/RetroBar/App.xaml.cs
index 76290d29..3104f1a7 100644
--- a/RetroBar/App.xaml.cs
+++ b/RetroBar/App.xaml.cs
@@ -1,17 +1,17 @@
-using System;
-using ManagedShell;
-using RetroBar.Utilities;
-using System.Windows;
+using ManagedShell;
+using ManagedShell.Common.Enums;
 using ManagedShell.Common.Helpers;
+using ManagedShell.Common.Logging;
 using ManagedShell.Interop;
-using Application = System.Windows.Application;
-using System.Windows.Interop;
-using System.Windows.Media;
-using ManagedShell.Common.Enums;
+using RetroBar.Utilities;
+using System;
 using System.Diagnostics;
-using System.Reflection;
-using ManagedShell.Common.Logging;
 using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using Application = System.Windows.Application;
 
 namespace RetroBar
 {
@@ -89,6 +89,10 @@ private void Settings_PropertyChanged(object sender, System.ComponentModel.Prope
             {
                 setTaskIconSize();
             }
+            else if (e.PropertyName == nameof(Settings.SortTaskbarByProgramName))
+            {
+                RestartApp();
+            }
         }
 
         private void loadTheme()
diff --git a/RetroBar/Controls/TaskList.xaml.cs b/RetroBar/Controls/TaskList.xaml.cs
index a05ed38d..2843f375 100644
--- a/RetroBar/Controls/TaskList.xaml.cs
+++ b/RetroBar/Controls/TaskList.xaml.cs
@@ -6,6 +6,8 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Collections;
 
 namespace RetroBar.Controls
 {
@@ -21,6 +23,7 @@ public partial class TaskList : UserControl
         private double TaskButtonLeftMargin;
         private double TaskButtonRightMargin;
         private ICollectionView taskbarItems;
+        private ProgramNameTaskbarSorter programNameTaskbarSorter;
 
         public static DependencyProperty ButtonWidthProperty = DependencyProperty.Register(nameof(ButtonWidth), typeof(double), typeof(TaskList), new PropertyMetadata(new double()));
 
@@ -49,6 +52,8 @@ public Taskbar Host
         public TaskList()
         {
             InitializeComponent();
+            programNameTaskbarSorter = new ProgramNameTaskbarSorter();
+            programNameTaskbarSorter.setSortingList(Settings.Instance.TaskbarSortingFilter);
         }
 
         private void SetStyles()
@@ -85,6 +90,14 @@ private void SetTasksCollection()
                 {
                     taskbarItems.CollectionChanged += GroupedWindows_CollectionChanged;
                     taskbarItems.Filter = Tasks_Filter;
+
+                    if (taskbarItems is ListCollectionView lcv)
+                    {
+                        /*lcv.CustomSort = (IComparer)(Settings.Instance.SortTaskbarByProgramName
+                        ? programNameTaskbarSorter
+                        : null);*/
+                        lcv.CustomSort = programNameTaskbarSorter;
+                    }
                 }
 
                 TasksList.ItemsSource = taskbarItems;
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 27c78bfe..24d05ac2 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -376,6 +376,18 @@
                                   IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowEndTaskButton, UpdateSourceTrigger=PropertyChanged}">
                             <Label Content="{DynamicResource show_end_task_button}" />
                         </CheckBox>
+                        <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=SortTaskbarByProgramName, UpdateSourceTrigger=PropertyChanged}">
+                            <Label Content="Group taskbar buttons by program" />
+                        </CheckBox>
+                        <StackPanel Margin="0,0,0,10">
+                            <Label Margin="0,0,0,5" Content="Grouping order filter (ie.: Brave.exe, Code.exe, ...):"/>
+                            <TextBox Text="{Binding Source={x:Static Settings:Settings.Instance},
+                            Path=TaskbarSortingFilter,
+                            UpdateSourceTrigger=PropertyChanged}"
+                            Width="400" Height="20"/>
+                        </StackPanel>
+
+
                         <DockPanel>
                             <Label VerticalAlignment="Center"
                                    Target="{Binding ElementName=cboWinNumHotkeysAction}">
diff --git a/RetroBar/Utilities/ProgramNameTaskbarSorter.cs b/RetroBar/Utilities/ProgramNameTaskbarSorter.cs
new file mode 100644
index 00000000..764e6e56
--- /dev/null
+++ b/RetroBar/Utilities/ProgramNameTaskbarSorter.cs
@@ -0,0 +1,58 @@
+using ManagedShell.WindowsTasks;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using static ManagedShell.Interop.NativeMethods;
+
+namespace RetroBar.Utilities
+{
+    internal class ProgramNameTaskbarSorter : IComparer
+    {
+        private List<string> programs = null;
+        private bool alphabeticSorting = Settings.Instance.SortTaskbarByProgramName;
+
+        public void setSortingList(String list)
+        {
+            if (!String.IsNullOrEmpty(list) && list.Length > 3 && list.Contains(","))
+            {
+                string[] parts = list.Split(',');
+                parts = parts.Select(p => p.Trim()).ToArray();
+
+                programs = new List<string>(parts);
+            }
+        }
+
+        public int Compare(object x, object y)
+        {
+            var winA = x as ApplicationWindow;
+            var winB = y as ApplicationWindow;
+            if (winA == null || winB == null) return 0;
+
+            if (programs != null)
+            {
+                int wantedIndexA = programs.FindIndex(p => winA.WinFileName != null && p != null && winA.WinFileName.IndexOf(p, StringComparison.OrdinalIgnoreCase) >= 0);
+                int wantedIndexB = programs.FindIndex(p => winB.WinFileName != null && p != null && winB.WinFileName.IndexOf(p, StringComparison.OrdinalIgnoreCase) >= 0);
+
+                if (wantedIndexA == -1 && wantedIndexB == -1) { }
+                else if (wantedIndexA == -1) { return 1; }
+                else if (wantedIndexB == -1) { return -1; }
+                else if (wantedIndexA < wantedIndexB) { return -1; }
+                else if (wantedIndexA > wantedIndexB) { return 1; }
+            }
+
+            if (!alphabeticSorting) { return 1; }
+
+            // Use WinFileName as a substitute for ProcessName
+            int cmp = string.Compare(winA.WinFileName, winB.WinFileName, StringComparison.OrdinalIgnoreCase);
+            System.Diagnostics.Debug.WriteLine("wina: " + winA.WinFileName + "winb: " + winB.WinFileName + "ret cmp: " + cmp);
+            if (cmp != 0) return cmp;
+
+            // Fallback: sort by window title
+            return string.Compare(winA.Title, winB.Title, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index f3da2fa0..8c4e0852 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -382,6 +382,20 @@ public bool AllowBlurBehind
             get => _allowBlurBehind;
             set => Set(ref _allowBlurBehind, value);
         }
+
+        private bool _sortTaskbarByProgramName = false;
+        public bool SortTaskbarByProgramName
+        {
+            get => _sortTaskbarByProgramName;
+            set => Set(ref _sortTaskbarByProgramName, value);
+        }
+
+        private string _taskbarSortingFilter = "";
+        public string TaskbarSortingFilter
+        {
+            get => _taskbarSortingFilter;
+            set => Set(ref _taskbarSortingFilter, value);
+        }
         #endregion
 
         #region Old Properties