diff --git a/archive.php b/archive.php
index 73aa964c..167dcbee 100644
--- a/archive.php
+++ b/archive.php
@@ -12,7 +12,6 @@ get_header();
 
 <?php
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <div class="wrapper" id="archive-wrapper">
@@ -64,11 +63,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div> <!-- .row -->
 
diff --git a/author.php b/author.php
index cd558ab1..840ec107 100644
--- a/author.php
+++ b/author.php
@@ -9,7 +9,6 @@
 
 get_header();
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 
@@ -88,11 +87,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div> <!-- .row -->
 
diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
new file mode 100644
index 00000000..5152c54e
--- /dev/null
+++ b/global-templates/right-sidebar-check.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Right sidebar check.
+ *
+ * @package understrap
+ */
+?>
+
+<?php $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' ); ?>
+
+<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
+
+  <?php get_sidebar( 'right' ); ?>
+
+<?php endif; ?>
diff --git a/index.php b/index.php
index 0ea055a0..6b405356 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,6 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <?php if ( is_front_page() && is_home() ) : ?>
@@ -64,11 +63,8 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+		
 
 	</div><!-- .row -->
 
diff --git a/page.php b/page.php
index 773e55a6..c1aa362e 100644
--- a/page.php
+++ b/page.php
@@ -13,7 +13,6 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 ?>
 
@@ -46,11 +45,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 
diff --git a/search.php b/search.php
index ee25d153..a6599106 100644
--- a/search.php
+++ b/search.php
@@ -8,7 +8,7 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 ?>
 
 <div class="wrapper" id="search-wrapper">
@@ -61,11 +61,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 
diff --git a/single.php b/single.php
index 2e8483ea..6c5a46fa 100644
--- a/single.php
+++ b/single.php
@@ -7,7 +7,6 @@
 
 get_header();
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <div class="wrapper" id="single-wrapper">
@@ -41,11 +40,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 
diff --git a/woocommerce.php b/woocommerce.php
index c49290fe..26d22732 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -13,7 +13,7 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 
 ?>
 
@@ -55,11 +55,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->