diff --git a/global-templates/left-sidebar-check.php b/global-templates/left-sidebar-check.php
index 7e02ebbf..c733027b 100644
--- a/global-templates/left-sidebar-check.php
+++ b/global-templates/left-sidebar-check.php
@@ -9,26 +9,9 @@
 
 <?php
 $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
-// On WooCommerce pages there is no need for sidebars as they leave
-// too little space for WooCommerce itself. We check if WooCommerce
-// is active and the current page is a WooCommerce page and we do
-// not render sidebars.
-$is_woocommerce = false;
-$this_page_id   = get_queried_object_id();
-if ( class_exists( 'WooCommerce' ) ) {
-
-	if ( is_woocommerce() || is_shop() || get_option( 'woocommerce_shop_page_id' ) === $this_page_id ||
-	     get_option( 'woocommerce_cart_page_id' ) == $this_page_id || get_option( 'woocommerce_checkout_page_id' ) == $this_page_id ||
-	     get_option( 'woocommerce_pay_page_id' ) == $this_page_id || get_option( 'woocommerce_thanks_page_id' ) === $this_page_id ||
-	     get_option( 'woocommerce_myaccount_page_id' ) == $this_page_id || get_option( 'woocommerce_edit_address_page_id' ) == $this_page_id ||
-	     get_option( 'woocommerce_view_order_page_id' ) == $this_page_id || get_option( 'woocommerce_terms_page_id' ) == $this_page_id
-	) {
-
-		$is_woocommerce = true;
-	}
-}
 ?>
-<?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos && ! $is_woocommerce ) : ?>
+
+<?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
 	<?php get_sidebar( 'left' ); ?>
 <?php endif; ?>
 
diff --git a/page.php b/page.php
index 1aff6ad7..09f80557 100644
--- a/page.php
+++ b/page.php
@@ -14,24 +14,7 @@ get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
 $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
-// On WooCommerce pages there is no need for sidebars as they leave
-// too little space for WooCommerce itself. We check if WooCommerce
-// is active and the current page is a WooCommerce page and we do
-// not render sidebars.
-$is_woocommerce = false;
-$this_page_id   = get_queried_object_id();
-if ( class_exists( 'WooCommerce' ) ) {
 
-	if ( is_woocommerce() || is_shop() || get_option( 'woocommerce_shop_page_id' ) === $this_page_id ||
-	     get_option( 'woocommerce_cart_page_id' ) == $this_page_id || get_option( 'woocommerce_checkout_page_id' ) == $this_page_id ||
-	     get_option( 'woocommerce_pay_page_id' ) == $this_page_id || get_option( 'woocommerce_thanks_page_id' ) === $this_page_id ||
-	     get_option( 'woocommerce_myaccount_page_id' ) == $this_page_id || get_option( 'woocommerce_edit_address_page_id' ) == $this_page_id ||
-	     get_option( 'woocommerce_view_order_page_id' ) == $this_page_id || get_option( 'woocommerce_terms_page_id' ) == $this_page_id
-	) {
-
-		$is_woocommerce = true;
-	}
-}
 ?>
 
 <div class="wrapper" id="page-wrapper">
diff --git a/search.php b/search.php
index d7501f12..63c08993 100644
--- a/search.php
+++ b/search.php
@@ -11,7 +11,7 @@ $container   = get_theme_mod( 'understrap_container_type' );
 $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
-<div class="wrapper search-wrapper">
+<div class="wrapper" id="search-wrapper">
 
 	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
 
diff --git a/woocommerce.php b/woocommerce.php
new file mode 100644
index 00000000..0d188f1d
--- /dev/null
+++ b/woocommerce.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * The template for displaying all woocommerce pages.
+ *
+ * This is the template that displays all pages by default.
+ * Please note that this is the WordPress construct of pages
+ * and that other 'pages' on your WordPress site will use a
+ * different template.
+ *
+ * @package understrap
+ */
+
+get_header();
+
+$container   = get_theme_mod( 'understrap_container_type' );
+$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+// On WooCommerce pages there is no need for sidebars as they leave
+// too little space for WooCommerce itself. We check if WooCommerce
+// is active and the current page is a WooCommerce page and we do
+// not render sidebars.
+$is_woocommerce = false;
+$this_page_id   = get_queried_object_id();
+if ( class_exists( 'WooCommerce' ) ) {
+
+	if ( is_woocommerce() || is_shop() || get_option( 'woocommerce_shop_page_id' ) === $this_page_id ||
+	     get_option( 'woocommerce_cart_page_id' ) == $this_page_id || get_option( 'woocommerce_checkout_page_id' ) == $this_page_id ||
+	     get_option( 'woocommerce_pay_page_id' ) == $this_page_id || get_option( 'woocommerce_thanks_page_id' ) === $this_page_id ||
+	     get_option( 'woocommerce_myaccount_page_id' ) == $this_page_id || get_option( 'woocommerce_edit_address_page_id' ) == $this_page_id ||
+	     get_option( 'woocommerce_view_order_page_id' ) == $this_page_id || get_option( 'woocommerce_terms_page_id' ) == $this_page_id
+	) {
+
+		$is_woocommerce = true;
+	}
+}
+?>
+
+<div class="wrapper" id="woocomerce-wrapper">
+
+	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+
+		<div class="row">
+
+			<!-- Do the left sidebar check -->
+			<?php get_template_part( 'global-templates/left-sidebar-check', 'none' ); ?>
+
+			<main class="site-main" id="main">
+
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php woocommerce_content(); ?>
+
+				<?php endwhile; // end of the loop. ?>
+
+			</main><!-- #main -->
+
+		</div><!-- #primary -->
+
+		<!-- Do the right sidebar check -->
+		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
+
+			<?php if ( ! $is_woocommerce ) : get_sidebar( 'right' ); ?>
+			<?php endif; ?>
+
+		<?php endif; ?>
+
+	</div><!-- .row -->
+
+</div><!-- Container end -->
+
+</div><!-- Wrapper end -->
+
+<?php get_footer(); ?>
\ No newline at end of file