diff --git a/scenes/main.tscn b/scenes/main.tscn
index 9609aac6..dd379480 100644
--- a/scenes/main.tscn
+++ b/scenes/main.tscn
@@ -342,11 +342,28 @@ theme_override_font_sizes/font_size = 12
 text = "Pick Color"
 clip_text = true
 
-[node name="ColorPicker" type="ColorPicker" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1549088178]
+[node name="PickerHide" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1783564195]
 visible = false
+self_modulate = Color(1, 1, 1, 0)
 top_level = true
 z_index = 1
 layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 2.0
+offset_top = -1.0
+offset_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+action_mode = 0
+button_mask = 3
+
+[node name="ColorPicker" type="ColorPicker" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1549088178]
+visible = false
+top_level = true
+z_index = 2
+layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.553
 anchor_top = 0.33
diff --git a/scripts/ui/SettingsMenu.cs b/scripts/ui/SettingsMenu.cs
index 96419487..a14f22d4 100644
--- a/scripts/ui/SettingsMenu.cs
+++ b/scripts/ui/SettingsMenu.cs
@@ -90,6 +90,7 @@ public override void _Ready()
         Button buttonTemplate = buttonHboxTemplate.GetNode<Button>("Button");
         Button colorButtonTemplate = settingTemplate.GetNode<Button>("ColorButton");
         ColorPicker colorPickerTemplate = settingTemplate.GetNode<ColorPicker>("ColorPicker");
+        Button hidePickerTemplate = settingTemplate.GetNode<Button>("PickerHide");
 
         settingTemplate.Visible = false;
 
@@ -182,10 +183,12 @@ public override void _Ready()
                 {
                     Button colorButton = colorButtonTemplate.Duplicate() as Button;
                     ColorPicker picker = colorPickerTemplate.Duplicate() as ColorPicker;
+                    Button pickerHider = hidePickerTemplate.Duplicate() as Button;
 
-                    setupColorPicker(setting, colorButton, picker);
+                    setupColorPicker(setting, colorButton, picker, pickerHider);
                     panel.AddChild(colorButton);
                     panel.AddChild(picker);
+                    panel.AddChild(pickerHider);
                 }
                 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 hideButton)
     {
         button.TooltipText = setting.Description;
         Logger.Log(setting.GetVariant().ToString());
@@ -537,6 +540,15 @@ private static void setupColorPicker(ISettingsItem setting, Button button, Color
         button.Pressed += () =>
         {
             picker.Visible = !picker.Visible;
+            if (picker.Visible)
+            {
+                hideButton.Visible = true;
+            }
+        };
+        hideButton.Pressed += () =>
+        {
+            picker.Visible = false;
+            hideButton.Visible = false;
         };
         button.VisibilityChanged += () =>
         {