diff --git a/scenes/main.tscn b/scenes/main.tscn
index 9609aac6..989b8f96 100644
--- a/scenes/main.tscn
+++ b/scenes/main.tscn
@@ -326,6 +326,21 @@ theme = ExtResource("3_tipki")
 theme_override_colors/font_color = Color(1, 1, 1, 1)
 text = "Button"
 
+[node name="PickerHide" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=787866892]
+self_modulate = Color(1, 1, 1, 0)
+top_level = true
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -3.0
+offset_right = 4.0
+offset_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+action_mode = 0
+button_mask = 3
+
 [node name="ColorButton" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=84045289]
 layout_mode = 1
 anchors_preset = -1
@@ -343,7 +358,6 @@ text = "Pick Color"
 clip_text = true
 
 [node name="ColorPicker" type="ColorPicker" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1549088178]
-visible = false
 top_level = true
 z_index = 1
 layout_mode = 1
diff --git a/scripts/ui/SettingsMenu.cs b/scripts/ui/SettingsMenu.cs
index 96419487..b4e57bfc 100644
--- a/scripts/ui/SettingsMenu.cs
+++ b/scripts/ui/SettingsMenu.cs
@@ -89,6 +89,7 @@ public override void _Ready()
         HBoxContainer buttonHboxTemplate = settingTemplate.GetNode<HBoxContainer>("ButtonHBoxContainer");
         Button buttonTemplate = buttonHboxTemplate.GetNode<Button>("Button");
         Button colorButtonTemplate = settingTemplate.GetNode<Button>("ColorButton");
+        Button pickerHiderTemplate = settingTemplate.GetNode<Button>("PickerHide");
         ColorPicker colorPickerTemplate = settingTemplate.GetNode<ColorPicker>("ColorPicker");
 
         settingTemplate.Visible = false;
@@ -182,9 +183,11 @@ public override void _Ready()
                 {
                     Button colorButton = colorButtonTemplate.Duplicate() as Button;
                     ColorPicker picker = colorPickerTemplate.Duplicate() as ColorPicker;
+                    Button pickerHider = pickerHiderTemplate.Duplicate() as Button;
 
-                    setupColorPicker(setting, colorButton, picker);
+                    setupColorPicker(setting, colorButton, picker, pickerHider);
                     panel.AddChild(colorButton);
+                    panel.AddChild(pickerHider);
                     panel.AddChild(picker);
                 }
                 else if (setting.List != null)
@@ -528,7 +531,7 @@ private static void setupButton(SettingsButton setting, Button button)
         };
     }
 
-    private static void setupColorPicker(ISettingsItem setting, Button button, ColorPicker picker)
+    private static void setupColorPicker(ISettingsItem setting, Button button, ColorPicker picker, Button pickerHider)
     {
         button.TooltipText = setting.Description;
         Logger.Log(setting.GetVariant().ToString());
@@ -537,10 +540,17 @@ private static void setupColorPicker(ISettingsItem setting, Button button, Color
         button.Pressed += () =>
         {
             picker.Visible = !picker.Visible;
+            pickerHider.Visible = picker.Visible;
         };
         button.VisibilityChanged += () =>
         {
             picker.Visible = false;
+            pickerHider.Visible = false;
+        };
+        pickerHider.Pressed += () =>
+        {
+            picker.Visible = false;
+            pickerHider.Visible = false;
         };
 
         picker.ColorChanged += (col) =>