Index: src/command.cpp
===================================================================
--- src/command.cpp	(revision 17019)
+++ src/command.cpp	(working copy)
@@ -537,7 +537,9 @@
 			_shift_pressed &&
 			IsLocalCompany() &&
 			!(cmd & CMD_NETWORK_COMMAND) &&
-			cmd_id != CMD_PAUSE) {
+			cmd_id != CMD_PAUSE &&
+			cmd_id != CMD_INSERT_ORDER && 
+			cmd_id != CMD_MODIFY_ORDER) {
 		/* estimate the cost. */
 		SetTownRatingTestMode(true);
 		res = proc(tile, flags, p1, p2, text);
Index: src/order_gui.cpp
===================================================================
--- src/order_gui.cpp	(revision 17019)
+++ src/order_gui.cpp	(working copy)
@@ -360,6 +360,10 @@
 			if (st->facilities & facil) {
 				order.MakeGoToStation(st_index);
 				if (_ctrl_pressed) order.SetLoadType(OLF_FULL_LOAD_ANY);
+				if (_shift_pressed) {
+					order.SetLoadType(OLFB_NO_LOAD);
+					order.SetUnloadType(OUFB_TRANSFER);
+				}
 				if (_settings_client.gui.new_nonstop && (v->type == VEH_TRAIN || v->type == VEH_ROAD)) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
 				return order;
 			}