Index: command.c
===================================================================
--- command.c	(revision 29310)
+++ command.c	(revision 29311)
@@ -94,7 +94,7 @@
 	PCB_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str);
 
 	if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, filename, NULL))
-		pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
+		pcb_tool_select_by_name(&PCB->hidlib, "buffer");
 
 	PCB_ACT_IRES(0);
 	return 0;
@@ -111,7 +111,7 @@
 	PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayoutToBuffer, format = argv[2].val.str);
 
 	if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, filename, format))
-		pcb_tool_select_by_id(&PCB->hidlib, PCB_MODE_PASTE_BUFFER);
+		pcb_tool_select_by_name(&PCB->hidlib, "buffer");
 
 	PCB_ACT_IRES(0);
 	return 0;