diff --git a/src/Greenshot.Base/Controls/GreenshotDoubleClickButton.cs b/src/Greenshot.Base/Controls/GreenshotDoubleClickButton.cs
new file mode 100644
index 000000000..a70fff93c
--- /dev/null
+++ b/src/Greenshot.Base/Controls/GreenshotDoubleClickButton.cs
@@ -0,0 +1,12 @@
+using System.Windows.Forms;
+
+namespace Greenshot.Base.Controls
+{
+    public class GreenshotDoubleClickButton : Button
+    {
+        public GreenshotDoubleClickButton()
+        {
+            SetStyle(ControlStyles.StandardClick | ControlStyles.StandardDoubleClick, true);
+        }
+    }
+}
diff --git a/src/Greenshot.Editor/Forms/ColorDialog.cs b/src/Greenshot.Editor/Forms/ColorDialog.cs
index c28e8802e..ce8dd4b4c 100644
--- a/src/Greenshot.Editor/Forms/ColorDialog.cs
+++ b/src/Greenshot.Editor/Forms/ColorDialog.cs
@@ -26,6 +26,7 @@ using System.Drawing;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Forms;
+using Greenshot.Base.Controls;
 using Greenshot.Base.IniFile;
 using Greenshot.Editor.Configuration;
 using Greenshot.Editor.Controls;
@@ -58,7 +59,6 @@ namespace Greenshot.Editor.Forms
         private readonly List<Button> _recentColorButtons = new List<Button>();
         private readonly ToolTip _toolTip = new ToolTip();
         private bool _updateInProgress;
-        private DateTime _lastClick = DateTime.Now;
 
         public Color Color
         {
@@ -116,7 +116,7 @@ namespace Greenshot.Editor.Forms
 
         private Button CreateColorButton(Color color, int x, int y, int w, int h)
         {
-            Button b = new Button
+            Button b = new GreenshotDoubleClickButton
             {
                 BackColor = color,
                 FlatStyle = FlatStyle.Flat,
@@ -126,10 +126,17 @@ namespace Greenshot.Editor.Forms
             };
             b.FlatAppearance.BorderSize = 0;
             b.Click += ColorButtonClick;
-            _toolTip.SetToolTip(b, ColorTranslator.ToHtml(color) + " | R:" + color.R + ", G:" + color.G + ", B:" + color.B);
+            b.DoubleClick += ColorButtonDoubleClick;
+            SetButtonTooltip(b, color);
             return b;
         }
 
+        private void ColorButtonDoubleClick(object sender, EventArgs e)
+        {
+            ColorButtonClick(sender, e);
+            BtnApplyClick(sender, e);
+        }
+
         private void CreateLastUsedColorButtonRow(int x, int y, int w, int h)
         {
             for (int i = 0; i < 12; i++)
@@ -149,6 +156,7 @@ namespace Greenshot.Editor.Forms
             {
                 _recentColorButtons[i].BackColor = EditorConfig.RecentColors[i];
                 _recentColorButtons[i].Enabled = true;
+                SetButtonTooltip(_recentColorButtons[i], EditorConfig.RecentColors[i]);
             }
         }
 
@@ -245,25 +253,11 @@ namespace Greenshot.Editor.Forms
         {
             Button b = (Button)sender;
             PreviewColor(b.BackColor, b);
-
-            if (IsDoubleClick(_lastClick))
-            {
-                BtnApplyClick(this, e);
-            }
-
-            _lastClick = DateTime.Now;
         }
 
-        private bool IsDoubleClick(DateTime lastClick)
+        private void SetButtonTooltip(Button colorButton, Color color)
         {
-            TimeSpan diff = DateTime.Now - lastClick;
-
-            if ((diff.TotalMilliseconds) <= SystemInformation.DoubleClickTime)
-            {
-                return true;
-            }
-
-            return false;
+            _toolTip.SetToolTip(colorButton, ColorTranslator.ToHtml(color) + " | R:" + color.R + ", G:" + color.G + ", B:" + color.B);
         }
 
         private void BtnTransparentClick(object sender, EventArgs e)