diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index b619562f0d1..23aa228923a 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -224,6 +224,10 @@ abstract class WC_Abstract_Order {
 		wc_add_order_item_meta( $item_id, 'method_id', $shipping_rate->id );
 		wc_add_order_item_meta( $item_id, 'cost', wc_format_decimal( $shipping_rate->cost ) );
 
+		// Save shipping taxes - Since 2.2
+		$taxes = array_map( 'wc_format_decimal', $shipping_rate->taxes );
+		wc_add_order_item_meta( $item_id, 'taxes', $taxes );
+
 		do_action( 'woocommerce_order_add_shipping', $this->id, $item_id, $shipping_rate );
 
 		// Update total
diff --git a/includes/admin/meta-boxes/views/html-order-fee.php b/includes/admin/meta-boxes/views/html-order-fee.php
index c6776279ddc..f7dd3c5a3a5 100644
--- a/includes/admin/meta-boxes/views/html-order-fee.php
+++ b/includes/admin/meta-boxes/views/html-order-fee.php
@@ -32,7 +32,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<?php
 		if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
-			$tax_data = maybe_unserialize( $line_tax_data );
+			$tax_data      = maybe_unserialize( $line_tax_data );
 
 			foreach ( $order_taxes as $tax_item ) :
 				$tax_item_id       = $tax_item['rate_id'];
diff --git a/includes/admin/meta-boxes/views/html-order-item.php b/includes/admin/meta-boxes/views/html-order-item.php
index 35a1ef2c825..7437c8ae72d 100644
--- a/includes/admin/meta-boxes/views/html-order-item.php
+++ b/includes/admin/meta-boxes/views/html-order-item.php
@@ -178,7 +178,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<?php
 		if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
-			$tax_data = maybe_unserialize( $line_tax_data );
+			$tax_data      = maybe_unserialize( $line_tax_data );
 
 			foreach ( $order_taxes as $tax_item ) :
 				$tax_item_id       = $tax_item['rate_id'];
diff --git a/includes/admin/meta-boxes/views/html-order-shipping.php b/includes/admin/meta-boxes/views/html-order-shipping.php
index 572b8765ddb..28aa28cf23b 100644
--- a/includes/admin/meta-boxes/views/html-order-shipping.php
+++ b/includes/admin/meta-boxes/views/html-order-shipping.php
@@ -54,11 +54,30 @@ if ( ! defined( 'ABSPATH' ) ) {
 		</div>
 	</td>
 
-	<?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) : for ( $i = 0;  $i < count( $order_taxes ); $i++ ) : ?>
+	<?php
+		if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
+			$shipping_taxes = isset( $item['taxes'] ) ? $item['taxes'] : '';
+			$tax_data       = maybe_unserialize( $shipping_taxes );
 
-		<td class="line_tax" width="1%"></td>
+			foreach ( $order_taxes as $tax_item ) :
+				$tax_item_id       = $tax_item['rate_id'];
+				$tax_item_total    = isset( $tax_data[ $tax_item_id ] ) ? $tax_data[ $tax_item_id ] : '';
 
-	<?php endfor; endif; ?>
+				?>
+
+					<td class="line_tax" width="1%">
+						<div class="view">
+							<?php echo ( '' != $tax_item_total ) ? wc_price( wc_round_tax_total( $tax_item_total ) ) : ''; ?>
+						</div>
+						<div class="edit" style="display: none;">
+							<input type="text" name="line_tax[<?php echo absint( $item_id ); ?>][<?php echo absint( $tax_item_id ); ?>]" placeholder="<?php echo wc_format_localized_price( 0 ); ?>" value="<?php echo ( isset( $tax_item_total ) ) ? esc_attr( wc_format_localized_price( $tax_item_total ) ) : ''; ?>" class="line_tax wc_input_price" />
+						</div>
+					</td>
+
+				<?php
+			endforeach;
+		endif;
+	?>
 
 	<td class="wc-order-item-refund-quantity" width="1%" style="display: none;"></td>
 
diff --git a/includes/class-wc-shipping-rate.php b/includes/class-wc-shipping-rate.php
index 771083aba49..a7d01a6d379 100644
--- a/includes/class-wc-shipping-rate.php
+++ b/includes/class-wc-shipping-rate.php
@@ -54,4 +54,4 @@ class WC_Shipping_Rate {
 		}
 		return $taxes;
 	}
-}
\ No newline at end of file
+}