diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index a4a44db5a..33605a5ee 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -211,7 +211,7 @@ private void UpdateMainFormTip()
 
                 foreach (HotkeySettings hotkey in Program.HotkeysConfig.Hotkeys.Where(x => x.HotkeyInfo.IsValidHotkey))
                 {
-                    sb.AppendFormat("{0}  |  {1}\r\n", hotkey.HotkeyInfo, hotkey.TaskSettings.Description);
+                    sb.AppendFormat("{0}  |  {1}\r\n", hotkey.HotkeyInfo, hotkey.TaskSettings);
                 }
             }
 
@@ -220,7 +220,7 @@ private void UpdateMainFormTip()
 
         private ToolStripMenuItem WorkflowMenuItem(HotkeySettings hotkeySetting)
         {
-            ToolStripMenuItem tsmi = new ToolStripMenuItem(hotkeySetting.TaskSettings.Description.Replace("&", "&&"));
+            ToolStripMenuItem tsmi = new ToolStripMenuItem(hotkeySetting.TaskSettings.ToString().Replace("&", "&&"));
             if (hotkeySetting.HotkeyInfo.IsValidHotkey)
             {
                 tsmi.ShortcutKeyDisplayString = "  " + hotkeySetting.HotkeyInfo;
@@ -711,7 +711,7 @@ private bool CheckCLIWorkflow(CLICommand command)
                 {
                     if (hotkeySetting.TaskSettings.Job != HotkeyType.None)
                     {
-                        if (command.Parameter == hotkeySetting.TaskSettings.Description)
+                        if (command.Parameter == hotkeySetting.TaskSettings.ToString())
                         {
                             ExecuteJob(hotkeySetting.TaskSettings);
                             return true;
diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs
index 14e19140a..85ab734cd 100644
--- a/ShareX/Forms/TaskSettingsForm.cs
+++ b/ShareX/Forms/TaskSettingsForm.cs
@@ -61,11 +61,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
             }
             else
             {
-                if (!TaskSettings.IsDefaultDescription)
-                {
-                    tbDescription.Text = TaskSettings.Description;
-                }
-
+                tbDescription.Text = TaskSettings.Description ?? string.Empty;
                 cbUseDefaultAfterCaptureSettings.Checked = TaskSettings.UseDefaultAfterCaptureJob;
                 cbUseDefaultAfterUploadSettings.Checked = TaskSettings.UseDefaultAfterUploadJob;
                 cbUseDefaultDestinationSettings.Checked = TaskSettings.UseDefaultDestinations;
@@ -83,7 +79,6 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
             AddEnumItemsContextMenu<HotkeyType>(x =>
             {
                 TaskSettings.Job = x;
-                //tbDescription.Text = TaskSettings.Job.GetLocalizedDescription();
                 UpdateWindowTitle();
             }, cmsTask);
             AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Swap(x), cmsAfterCapture);
diff --git a/ShareX/HotkeySettings.cs b/ShareX/HotkeySettings.cs
index 1eb145dba..01e755b2e 100644
--- a/ShareX/HotkeySettings.cs
+++ b/ShareX/HotkeySettings.cs
@@ -50,7 +50,7 @@ public override string ToString()
         {
             if (HotkeyInfo != null && TaskSettings != null)
             {
-                return string.Format("Hotkey: {0}{1}, Job: {2}", HotkeyInfo, ", Description: " + TaskSettings.Description, TaskSettings.Job);
+                return string.Format("Hotkey: {0}, Description: {1}, Job: {2}", HotkeyInfo, TaskSettings, TaskSettings.Job);
             }
 
             return string.Empty;
diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs
index 78d0ecbd1..0053f30da 100644
--- a/ShareX/TaskSettings.cs
+++ b/ShareX/TaskSettings.cs
@@ -40,27 +40,7 @@ namespace ShareX
 {
     public class TaskSettings
     {
-        private string description = string.Empty;
-
-        public string Description
-        {
-            get
-            {
-                return !string.IsNullOrEmpty(description) ? description : Job.GetLocalizedDescription();
-            }
-            set
-            {
-                description = value;
-            }
-        }
-
-        public bool IsDefaultDescription
-        {
-            get
-            {
-                return string.IsNullOrEmpty(description);
-            }
-        }
+        public string Description = string.Empty;
 
         public HotkeyType Job = HotkeyType.None;
 
@@ -128,7 +108,7 @@ public TaskSettingsCapture TaskSettingsCaptureReference
 
         public override string ToString()
         {
-            return Description;
+            return !string.IsNullOrEmpty(Description) ? Description : Job.GetLocalizedDescription();
         }
 
         public bool IsUsingDefaultSettings