diff --git a/ShareX.HelpersLib/Colors/GradientInfo.cs b/ShareX.HelpersLib/Colors/GradientInfo.cs
index 5fa99cf47..8ef5716f6 100644
--- a/ShareX.HelpersLib/Colors/GradientInfo.cs
+++ b/ShareX.HelpersLib/Colors/GradientInfo.cs
@@ -42,7 +42,7 @@ public bool IsValid
         {
             get
             {
-                return Colors != null && Colors.Count >= 2 && Colors.Any(x => x.Location == 0f) && Colors.Any(x => x.Location == 100f);
+                return Colors != null && Colors.Count > 0;
             }
         }
 
@@ -71,10 +71,21 @@ public void Draw(Graphics g, Rectangle rect)
 
         public ColorBlend GetColorBlend()
         {
+            List<GradientStop> colors = new List<GradientStop>(Colors.OrderBy(x => x.Location));
+
+            if (!colors.Any(x => x.Location == 0))
+            {
+                colors.Insert(0, new GradientStop(colors[0].Color, 0f));
+            }
+
+            if (!colors.Any(x => x.Location == 100))
+            {
+                colors.Add(new GradientStop(colors[colors.Count - 1].Color, 100f));
+            }
+
             ColorBlend colorBlend = new ColorBlend();
-            IEnumerable<GradientStop> gradient = Colors.OrderBy(x => x.Location);
-            colorBlend.Colors = gradient.Select(x => x.Color).ToArray();
-            colorBlend.Positions = gradient.Select(x => x.Location / 100).ToArray();
+            colorBlend.Colors = colors.Select(x => x.Color).ToArray();
+            colorBlend.Positions = colors.Select(x => x.Location / 100).ToArray();
             return colorBlend;
         }
 
diff --git a/ShareX.HelpersLib/Colors/GradientStop.cs b/ShareX.HelpersLib/Colors/GradientStop.cs
index 213ca0c58..0ee5dbf0e 100644
--- a/ShareX.HelpersLib/Colors/GradientStop.cs
+++ b/ShareX.HelpersLib/Colors/GradientStop.cs
@@ -32,7 +32,7 @@ namespace ShareX.HelpersLib
     public class GradientStop
     {
         [DefaultValue(typeof(Color), "Black"), Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
-        public Color Color { get; set; }
+        public Color Color { get; set; } = Color.Black;
 
         private float location;
 
@@ -51,7 +51,6 @@ public float Location
 
         public GradientStop()
         {
-            this.ApplyDefaultPropertyValues();
         }
 
         public GradientStop(Color color, float offset)
diff --git a/ShareX.HelpersLib/Forms/GradientPickerForm.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.resx
index dfa415049..1bc783e00 100644
--- a/ShareX.HelpersLib/Forms/GradientPickerForm.resx
+++ b/ShareX.HelpersLib/Forms/GradientPickerForm.resx
@@ -146,6 +146,10 @@
   <data name="&gt;&gt;lvGradientPoints.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 112</value>
   </data>
@@ -170,6 +174,9 @@
   <data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
+  <data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 136</value>
   </data>
@@ -195,15 +202,14 @@
     <value>8</value>
   </data>
   <data name="nudLocation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>64, 188</value>
+    <value>8, 216</value>
   </data>
   <data name="nudLocation.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 20</value>
+    <value>112, 20</value>
   </data>
   <data name="nudLocation.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="nudLocation.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
     <value>Center</value>
   </data>
@@ -222,8 +228,11 @@
   <data name="lblLocation.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="lblLocation.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="lblLocation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 192</value>
+    <value>5, 200</value>
   </data>
   <data name="lblLocation.Size" type="System.Drawing.Size, System.Drawing">
     <value>51, 13</value>
@@ -270,6 +279,9 @@
   <data name="lblGradientType.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="lblGradientType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="lblGradientType.Location" type="System.Drawing.Point, System.Drawing">
     <value>5, 88</value>
   </data>
@@ -294,6 +306,9 @@
   <data name="&gt;&gt;lblGradientType.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
+  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 280</value>
   </data>
@@ -318,6 +333,9 @@
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="btnCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 280</value>
   </data>
@@ -342,6 +360,9 @@
   <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="pbPreview.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="pbPreview.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 26</value>
   </data>
@@ -366,6 +387,9 @@
   <data name="lblPreview.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="lblPreview.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="lblPreview.Location" type="System.Drawing.Point, System.Drawing">
     <value>5, 8</value>
   </data>
@@ -390,8 +414,11 @@
   <data name="&gt;&gt;lblPreview.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="cbtnCurrentColor.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="cbtnCurrentColor.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 160</value>
+    <value>8, 168</value>
   </data>
   <data name="cbtnCurrentColor.Size" type="System.Drawing.Size, System.Drawing">
     <value>112, 24</value>
@@ -406,7 +433,7 @@
     <value>cbtnCurrentColor</value>
   </data>
   <data name="&gt;&gt;cbtnCurrentColor.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;cbtnCurrentColor.Parent" xml:space="preserve">
     <value>$this</value>