Index: shape.c
===================================================================
--- shape.c	(revision 29310)
+++ shape.c	(revision 29311)
@@ -255,7 +255,7 @@
 		pcb_r_delete_entry(PCB_CURRLAYER(PCB)->polygon_tree, (pcb_box_t *)p);
 		pcb_poly_free_fields(p);
 		pcb_poly_free(p);
-		pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
+		pcb_tool_select_by_name(&PCB->hidlib, "buffer");
 	}
 	return p;
 }
@@ -303,7 +303,7 @@
 			pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_LINE, PCB_CURRLAYER(PCB), l, l);
 			pcb_r_delete_entry(PCB_CURRLAYER(PCB)->line_tree, (pcb_box_t *)l);
 			pcb_line_free(l);
-			pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
+			pcb_tool_select_by_name(&PCB->hidlib, "buffer");
 		}
 	}
 	return l;