Index: branches/5.2.x/units/shipping/shipping_tag_processor.php
===================================================================
diff -u -N -r16151 -r16310
--- branches/5.2.x/units/shipping/shipping_tag_processor.php	(.../shipping_tag_processor.php)	(revision 16151)
+++ branches/5.2.x/units/shipping/shipping_tag_processor.php	(.../shipping_tag_processor.php)	(revision 16310)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_tag_processor.php 16151 2015-03-21 12:23:28Z alex $
+* @version	$Id: shipping_tag_processor.php 16310 2016-01-17 11:55:07Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -235,9 +235,14 @@
 		{
 			$original_shipping = $original_shipping[$package_id];
 			$key = $original_shipping['ShippingId'];
-			$shipping_types[$key]['TotalCost'] = $this->Application->isAdminUser ? $original_shipping['TotalCost'] : $shipping_types[$key]['TotalCost'];
-			$shipping_types[$key]['ShippingName'] = $this->Application->isAdminUser ? 'Original: '.$original_shipping['ShippingName'] : $shipping_types[$key]['ShippingName'];
-			$shipping_types[$key]['ShippingId'] = $key;
+
+			// When changing shipping type (via dropdown), then prefer current order's actual
+			// shipping info over one from Shipping Quote Engines.
+			if ( $this->Application->isAdminUser ) {
+				$shipping_types[$key] = $original_shipping;
+				$shipping_types[$key]['ShippingName'] = 'Original: ' . $original_shipping['ShippingName'];
+			}
+
 			$selected_id = $key;
 		}