diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php
index 4877d326..dc04ca7e 100644
--- a/page-templates/both-sidebarspage.php
+++ b/page-templates/both-sidebarspage.php
@@ -23,7 +23,11 @@ $container = get_theme_mod( 'understrap_container_type' );
 				<?php get_sidebar( 'left' ); ?>
 
 				<div
-					class="<?php if ( is_active_sidebar( 'left-sidebar' ) || is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-4<?php else : ?>col-md-12<?php endif; ?> content-area"
+					class="<?php
+						if ( is_active_sidebar( 'left-sidebar' ) xor is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-8<?php
+						elseif ( is_active_sidebar( 'left-sidebar' ) && is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-4<?php
+						else : ?>col-md-12<?php
+						endif; ?> content-area"
 					id="primary">
 
 					<main class="site-main" id="main" role="main">
@@ -44,7 +48,9 @@ $container = get_theme_mod( 'understrap_container_type' );
 					</main><!-- #main -->
 
 				</div><!-- #primary -->
+
 				<?php get_sidebar( 'right' ); ?>
+				
 			</div><!-- .row -->
 
 		</div><!-- Container end -->
diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php
new file mode 100644
index 00000000..7aa91fb6
--- /dev/null
+++ b/page-templates/right-sidebarpage.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Template Name: Right Sidebar Layout
+ *
+ * This template can be used to override the default template and sidebar setup
+ *
+ * @package understrap
+ */
+
+get_header();
+$container = get_theme_mod( 'understrap_container_type' );
+?>
+
+<div class="wrapper" id="page-wrapper">
+
+	<div class="<?php echo esc_html( $container ); ?>" id="content">
+
+		<div class="row">
+
+			<div
+				class="<?php if ( is_active_sidebar( 'right-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area"
+				id="primary">
+
+				<main class="site-main" id="main" role="main">
+
+					<?php while ( have_posts() ) : the_post(); ?>
+
+						<?php get_template_part( 'loop-templates/content', 'page' ); ?>
+
+						<?php
+						// If comments are open or we have at least one comment, load up the comment template.
+						if ( comments_open() || get_comments_number() ) :
+							comments_template();
+						endif;
+						?>
+
+					<?php endwhile; // end of the loop. ?>
+
+				</main><!-- #main -->
+
+			</div><!-- #primary -->
+
+			<?php get_sidebar( 'right' ); ?>
+
+		</div><!-- .row -->
+
+	</div><!-- Container end -->
+
+</div><!-- Wrapper end -->
+
+<?php get_footer(); ?>