Index: src_plugins/tool_std/tool_arc.c
===================================================================
--- src_plugins/tool_std/tool_arc.c	(revision 33194)
+++ src_plugins/tool_std/tool_arc.c	(revision 33195)
@@ -195,7 +195,7 @@
 
 void pcb_tool_arc_escape(rnd_hidlib_t *hl)
 {
-	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
 	else
 		rnd_tool_select_by_name(hl, "arc");
Index: src_plugins/tool_std/tool_rectangle.c
===================================================================
--- src_plugins/tool_std/tool_rectangle.c	(revision 33194)
+++ src_plugins/tool_std/tool_rectangle.c	(revision 33195)
@@ -117,7 +117,7 @@
 
 void pcb_tool_rectangle_escape(rnd_hidlib_t *hl)
 {
-	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
 	else
 		rnd_tool_select_by_name(hl, "rectangle");