diff --git a/scenes/drop_area.gd b/scenes/drop_area.gd
index 187faaa..cf489a3 100644
--- a/scenes/drop_area.gd
+++ b/scenes/drop_area.gd
@@ -33,15 +33,17 @@ func _input(event):
 			if dragged:
 				for area in get_tree().get_nodes_in_group("drop_areas"):
 					if area.hovered:
-						if area.highlighted and game.dragged_object:
-							game.dragged_object.dropped_on(area.get_parent_with_type())
+						if area.highlighted:
+							get_parent_with_type().dropped_on(area.get_parent_with_type())
 				_turn_off_highlights()
 				dragged = false
+			if game.dragged_object:
+				if hovered and highlighted:
+					game.dragged_object.dropped_on(get_parent_with_type())
 			
 		if event.button_index == BUTTON_LEFT and event.pressed and hovered:
 			if get_parent().type == "file" and get_parent().item_type == "wd":
 				dragged = true
-				game.dragged_object = get_parent_with_type()
 				_turn_on_highlights()
 
 func _set_highlighted(new_highlighted):
diff --git a/scenes/drop_area.tscn b/scenes/drop_area.tscn
index b297917..ed564e6 100644
--- a/scenes/drop_area.tscn
+++ b/scenes/drop_area.tscn
@@ -17,7 +17,6 @@ void fragment() {
 	COLOR = vec4(0.4 + hovered*0.2, 0.65 + hovered*0.2, 1, smoothstep(0.5,0.2 + hovered*0.1,d));
 }
 "
-custom_defines = ""
 
 [sub_resource type="ShaderMaterial" id=3]
 resource_local_to_scene = true