diff --git a/src/Tools/Bucket.gd b/src/Tools/Bucket.gd
index 8102b9d5e..11d56521a 100644
--- a/src/Tools/Bucket.gd
+++ b/src/Tools/Bucket.gd
@@ -94,7 +94,7 @@ func update_pattern() -> void:
 
 
 func draw_start(position : Vector2) -> void:
-	if not position in Global.current_project.selected_pixels:
+	if not position in Global.current_project.selected_pixels or Global.current_project.layers[Global.current_project.current_layer].locked:
 		return
 	var undo_data = _get_undo_data()
 	if _fill_area == 0:
diff --git a/src/Tools/Draw.gd b/src/Tools/Draw.gd
index 7f0671f89..60b785f24 100644
--- a/src/Tools/Draw.gd
+++ b/src/Tools/Draw.gd
@@ -177,6 +177,8 @@ func commit_undo(action : String) -> void:
 
 
 func draw_tool(position : Vector2) -> void:
+	if Global.current_project.layers[Global.current_project.current_layer].locked:
+		return
 	var strength := _strength
 	if Global.pressure_sensitivity_mode == Global.Pressure_Sensitivity.ALPHA:
 		strength *= Tools.pen_pressure