diff --git a/src/ui_parts/handles_manager.gd b/src/ui_parts/handles_manager.gd
index 41cfb035..f45187f1 100644
--- a/src/ui_parts/handles_manager.gd
+++ b/src/ui_parts/handles_manager.gd
@@ -695,13 +695,13 @@ func _unhandled_input(event: InputEvent) -> void:
 			hovered_handle = null
 			State.clear_all_hovered()
 	
-	if visible and event is InputEventMouseMotion:
+	if event is InputEventMouseMotion:
 		# Allow moving view while dragging handle.
 		if event.button_mask & MOUSE_BUTTON_MASK_MIDDLE:
 			return
 		
 		should_deselect_all = false
-		if is_instance_valid(dragged_handle):
+		if visible and is_instance_valid(dragged_handle):
 			# Move the handle that's being dragged.
 			var event_pos := get_event_pos(event)
 			var new_pos := Utils64Bit.transform_vector_mult(
diff --git a/src/ui_widgets/GridDrawingControl.gd b/src/ui_widgets/GridDrawingControl.gd
index cd9993fc..34c27ab8 100644
--- a/src/ui_widgets/GridDrawingControl.gd
+++ b/src/ui_widgets/GridDrawingControl.gd
@@ -5,6 +5,9 @@ class_name PanelGrid extends GridContainer
 @export var dim_last_item := false
 
 func setup() -> void:
+	for child in get_children():
+		child.queue_free()
+	
 	for item_idx in items.size():
 		var item := items[item_idx]
 		var panel_container := PanelContainer.new()