diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd
index 2d15c6b63..3a79882e1 100644
--- a/src/Autoload/Tools.gd
+++ b/src/Autoload/Tools.gd
@@ -509,7 +509,7 @@ func swap_color() -> void:
 	assign_color(left, MOUSE_BUTTON_RIGHT, false)
 
 
-func assign_color(color: Color, button: int, change_alpha := true, index: int = 0) -> void:
+func assign_color(color: Color, button: int, change_alpha := true, index: int = -1) -> void:
 	var c: Color = _slots[button].color
 	# This was requested by Issue #54 on GitHub
 	if color.a == 0 and change_alpha:
diff --git a/src/Palette/PaletteGrid.gd b/src/Palette/PaletteGrid.gd
index a960a25d0..89b4633fb 100644
--- a/src/Palette/PaletteGrid.gd
+++ b/src/Palette/PaletteGrid.gd
@@ -85,7 +85,7 @@ func scroll_palette(origin: Vector2i) -> void:
 ## This is helpful when we select color indirectly (e.g through colorpicker)
 func find_and_select_color(color_info: Dictionary, mouse_button: int) -> void:
 	var target_color: Color = color_info.get("color", Color(0, 0, 0, 0))
-	var palette_color_index: int = color_info.get("index", 0)
+	var palette_color_index: int = color_info.get("index", -1)
 	if not is_instance_valid(current_palette):
 		return
 	var selected_index := Palettes.current_palette_get_selected_color_index(mouse_button)