diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs
index 3aa20dc2..73f63d8b 100644
--- a/src/Commands/QueryTags.cs
+++ b/src/Commands/QueryTags.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Commands
 
             Context = repo;
             WorkingDirectory = repo;
-            Args = $"tag -l --sort=-creatordate --format=\"{_boundary}%(refname)%00%(objectname)%00%(*objectname)%00%(contents:subject)%0a%0a%(contents:body)\"";
+            Args = $"tag -l --format=\"{_boundary}%(refname)%00%(objectname)%00%(*objectname)%00%(creatordate:unix)%00%(contents:subject)%0a%0a%(contents:body)\"";
         }
 
         public List<Models.Tag> Result()
@@ -25,14 +25,15 @@ namespace SourceGit.Commands
             foreach (var record in records)
             {
                 var subs = record.Split('\0', StringSplitOptions.None);
-                if (subs.Length != 4)
+                if (subs.Length != 5)
                     continue;
 
-                var message = subs[3].Trim();
+                var message = subs[4].Trim();
                 tags.Add(new Models.Tag()
                 {
                     Name = subs[0].Substring(10),
                     SHA = string.IsNullOrEmpty(subs[2]) ? subs[1] : subs[2],
+                    CreatorDate = ulong.Parse(subs[3]),
                     Message = string.IsNullOrEmpty(message) ? null : message,
                 });
             }
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 4ade5096..f63a19fc 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -38,6 +38,12 @@ namespace SourceGit.Models
             set;
         } = false;
 
+        public TagSortMode TagSortMode
+        {
+            get;
+            set;
+        } = TagSortMode.CreatorDate;
+
         public bool IncludeUntrackedInLocalChanges
         {
             get;
diff --git a/src/Models/Tag.cs b/src/Models/Tag.cs
index 2e8f2c8e..51681d93 100644
--- a/src/Models/Tag.cs
+++ b/src/Models/Tag.cs
@@ -2,10 +2,18 @@
 
 namespace SourceGit.Models
 {
+    public enum TagSortMode
+    {
+        CreatorDate = 0,
+        NameInAscending,
+        NameInDescending,
+    }
+
     public class Tag : ObservableObject
     {
         public string Name { get; set; } = string.Empty;
         public string SHA { get; set; } = string.Empty;
+        public ulong CreatorDate { get; set; } = 0;
         public string Message { get; set; } = string.Empty;
 
         public FilterMode FilterMode
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 433716b4..81bbbaa6 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -590,6 +590,10 @@
   <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">UPDATE SUBMODULE</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">TAGS</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">NEW TAG</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">By Creator Date</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">By Name (Ascending)</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">By Name (Descending)</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">Sort</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">Open in Terminal</x:String>
   <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">Use relative time in histories</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 51c48f9d..9f2927fe 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -594,6 +594,10 @@
   <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">更新子模块</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">标签列表</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">新建标签</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">按创建时间</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">按名称（升序）</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">按名称（降序）</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">排序</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">在终端中打开</x:String>
   <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">在提交列表中使用相对时间</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">工作树列表</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 420750ed..93b37257 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -593,6 +593,10 @@
   <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">更新子模組</x:String>
   <x:String x:Key="Text.Repository.Tags" xml:space="preserve">標籤列表</x:String>
   <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">新增標籤</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">依建立時間</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">依名稱升序</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">依名稱降序</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">排序</x:String>
   <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">在終端機中開啟</x:String>
   <x:String x:Key="Text.Repository.UseRelativeTimeInHistories" xml:space="preserve">在提交清單中使用相對時間</x:String>
   <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">工作區列表</x:String>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 862dfa94..5d84d979 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -141,6 +141,20 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public Models.TagSortMode TagSortMode
+        {
+            get => _settings.TagSortMode;
+            set
+            {
+                if (value != _settings.TagSortMode)
+                {
+                    _settings.TagSortMode = value;
+                    OnPropertyChanged();
+                    VisibleTags = BuildVisibleTags();
+                }
+            }
+        }
+
         public string Filter
         {
             get => _filter;
@@ -2131,6 +2145,19 @@ namespace SourceGit.ViewModels
 
         private List<Models.Tag> BuildVisibleTags()
         {
+            switch (_settings.TagSortMode)
+            {
+                case Models.TagSortMode.CreatorDate:
+                    _tags.Sort((l, r) => r.CreatorDate.CompareTo(l.CreatorDate));
+                    break;
+                case Models.TagSortMode.NameInAscending:
+                    _tags.Sort((l, r) => Models.NumericSort.Compare(l.Name, r.Name));
+                    break;
+                default:
+                    _tags.Sort((l, r) => Models.NumericSort.Compare(r.Name, l.Name));
+                    break;
+            }
+
             var visible = new List<Models.Tag>();
             if (string.IsNullOrEmpty(_filter))
             {
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 49f1034e..e3f5a9e0 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -231,7 +231,7 @@
 
           <!-- Tags -->
           <ToggleButton Grid.Row="4" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
-            <Grid ColumnDefinitions="16,Auto,*,Auto,Auto">
+            <Grid ColumnDefinitions="16,Auto,*,Auto,Auto,Auto">
               <Path Grid.Column="0" Width="11" Height="11" Margin="2,1,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Tags}" Fill="{DynamicResource Brush.FG2}"/>
               <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/>
               <TextBlock Grid.Column="2" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
@@ -240,8 +240,16 @@
                             Width="14" 
                             IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
                             ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/>
-              <Button Grid.Column="4" 
-                      Classes="icon_button" 
+              <Button Grid.Column="4"
+                      Classes="icon_button"
+                      Width="14"
+                      Margin="8,0,0,0"
+                      Click="OnOpenSortTagMenu"
+                      ToolTip.Tip="{DynamicResource Text.Repository.Tags.Sort}">
+                <Path Width="12" Height="12" Margin="0,2,0,0" Data="{StaticResource Icons.Order}"/>
+              </Button>
+              <Button Grid.Column="5"
+                      Classes="icon_button"
                       Width="14"
                       Margin="8,0"
                       Command="{Binding CreateNewTag}" 
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 6c5352e8..feccb686 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -453,6 +453,50 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
+        private void OnOpenSortTagMenu(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button button && DataContext is ViewModels.Repository repo)
+            {
+                var byCreatorDate = new MenuItem();
+                byCreatorDate.Header = App.Text("Repository.Tags.OrderByCreatorDate");
+                if (repo.TagSortMode == Models.TagSortMode.CreatorDate)
+                    byCreatorDate.Icon = App.CreateMenuIcon("Icons.Check");
+                byCreatorDate.Click += (_, ev) =>
+                {
+                    repo.TagSortMode = Models.TagSortMode.CreatorDate;
+                    ev.Handled = true;
+                };
+
+                var byNameAsc = new MenuItem();
+                byNameAsc.Header = App.Text("Repository.Tags.OrderByNameAsc");
+                if (repo.TagSortMode == Models.TagSortMode.NameInAscending)
+                    byNameAsc.Icon = App.CreateMenuIcon("Icons.Check");
+                byNameAsc.Click += (_, ev) =>
+                {
+                    repo.TagSortMode = Models.TagSortMode.NameInAscending;
+                    ev.Handled = true;
+                };
+
+                var byNameDes = new MenuItem();
+                byNameDes.Header = App.Text("Repository.Tags.OrderByNameDes");
+                if (repo.TagSortMode == Models.TagSortMode.NameInDescending)
+                    byNameDes.Icon = App.CreateMenuIcon("Icons.Check");
+                byNameDes.Click += (_, ev) =>
+                {
+                    repo.TagSortMode = Models.TagSortMode.NameInDescending;
+                    ev.Handled = true;
+                };
+
+                var menu = new ContextMenu();
+                menu.Items.Add(byCreatorDate);
+                menu.Items.Add(byNameAsc);
+                menu.Items.Add(byNameDes);
+                menu.Open(button);
+            }
+
+            e.Handled = true;
+        }
+
         private void OnSkipInProgress(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.Repository repo)