diff --git a/includes/shortcodes/class-wc-shortcode-view-order.php b/includes/shortcodes/class-wc-shortcode-view-order.php
index 9a40be5315e..98eaf4c79c0 100644
--- a/includes/shortcodes/class-wc-shortcode-view-order.php
+++ b/includes/shortcodes/class-wc-shortcode-view-order.php
@@ -53,34 +53,10 @@ class WC_Shortcode_View_Order {
 
 		$status = get_term_by('slug', $order->status, 'shop_order_status');
 
-		echo '<p class="order-info">'
-		. sprintf( __( 'Order <mark class="order-number">%s</mark> made on <mark class="order-date">%s</mark>', 'woocommerce'), $order->get_order_number(), date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ) )
-		. '. ' . sprintf( __( 'Order status: <mark class="order-status">%s</mark>', 'woocommerce' ), __( $status->name, 'woocommerce' ) )
-		. '.</p>';
-
-		$notes = $order->get_customer_order_notes();
-		if ($notes) :
-			?>
-			<h2><?php _e( 'Order Updates', 'woocommerce' ); ?></h2>
-			<ol class="commentlist notes">
-				<?php foreach ($notes as $note) : ?>
-				<li class="comment note">
-					<div class="comment_container">
-						<div class="comment-text">
-							<p class="meta"><?php echo date_i18n(__( 'l jS \o\f F Y, h:ia', 'woocommerce' ), strtotime($note->comment_date)); ?></p>
-							<div class="description">
-								<?php echo wpautop(wptexturize($note->comment_content)); ?>
-							</div>
-			  				<div class="clear"></div>
-			  			</div>
-						<div class="clear"></div>
-					</div>
-				</li>
-				<?php endforeach; ?>
-			</ol>
-			<?php
-		endif;
-
-		do_action( 'woocommerce_view_order', $order_id );
+		woocommerce_get_template( 'myaccount/view-order.php', array(
+			'order_id'	=> $order_id,
+			'order'		=> $order,
+			'status'	=> $status
+		) );
 	}
 }
\ No newline at end of file
diff --git a/templates/myaccount/view-order.php b/templates/myaccount/view-order.php
new file mode 100644
index 00000000000..f035eafbde7
--- /dev/null
+++ b/templates/myaccount/view-order.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * View Order
+ *
+ * Shows the details of a particular order on the account page 
+ *
+ * @author    WooThemes
+ * @package   WooCommerce/Templates
+ * @version   2.0.15
+ */
+
+echo '<p class="order-info">'
+. sprintf( __( 'Order <mark class="order-number">%s</mark> made on <mark class="order-date">%s</mark>', 'woocommerce'), $order->get_order_number(), date_i18n( get_option( 'date_format' ), strtotime( $order->order_date ) ) )
+. '. ' . sprintf( __( 'Order status: <mark class="order-status">%s</mark>', 'woocommerce' ), __( $status->name, 'woocommerce' ) )
+. '.</p>';
+
+$notes = $order->get_customer_order_notes();
+if ($notes) :
+	?>
+	<h2><?php _e( 'Order Updates', 'woocommerce' ); ?></h2>
+	<ol class="commentlist notes">
+		<?php foreach ($notes as $note) : ?>
+		<li class="comment note">
+			<div class="comment_container">
+				<div class="comment-text">
+					<p class="meta"><?php echo date_i18n(__( 'l jS \o\f F Y, h:ia', 'woocommerce' ), strtotime($note->comment_date)); ?></p>
+					<div class="description">
+						<?php echo wpautop(wptexturize($note->comment_content)); ?>
+					</div>
+					<div class="clear"></div>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</li>
+		<?php endforeach; ?>
+	</ol>
+	<?php
+endif;
+
+do_action( 'woocommerce_view_order', $order_id );
\ No newline at end of file