diff --git a/src/UI/ColorAndToolOptions.gd b/src/UI/ColorAndToolOptions.gd
index 44d112fb8..ffb75e0b5 100644
--- a/src/UI/ColorAndToolOptions.gd
+++ b/src/UI/ColorAndToolOptions.gd
@@ -22,10 +22,12 @@ func _on_ColorPickerButton_color_changed(color : Color, right : bool):
 
 func _on_ColorPickerButton_pressed() -> void:
 	Global.can_draw = false
+	Tools.disconnect("color_changed", self, "update_color")
 
 
 func _on_ColorPickerButton_popup_closed() -> void:
 	Global.can_draw = true
+	Tools.connect("color_changed", self, "update_color")
 
 
 func _on_ColorDefaults_pressed() -> void: