diff --git a/404.php b/404.php
index f1f6519..a01303c 100644
--- a/404.php
+++ b/404.php
@@ -14,7 +14,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="404-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
diff --git a/author.php b/author.php
index e177e5f..5907135 100644
--- a/author.php
+++ b/author.php
@@ -15,7 +15,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="author-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
@@ -41,7 +41,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 						<?php if ( ! empty( $curauth->user_url ) ) : ?>
 							<dt><?php esc_html_e( 'Website', 'understrap' ); ?></dt>
 							<dd>
-								<a href="<?php echo esc_html( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
+								<a href="<?php echo esc_attr( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
 							</dd>
 						<?php endif; ?>
 
diff --git a/footer.php b/footer.php
index c9cd812..301599d 100644
--- a/footer.php
+++ b/footer.php
@@ -15,7 +15,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="wrapper-footer">
 
-	<div class="<?php echo esc_html( $container ); ?>">
+	<div class="<?php echo esc_attr( $container ); ?>">
 
 		<div class="row">
 
diff --git a/index.php b/index.php
index 7832076..b7eb064 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="wrapper-index">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php
index 0d3b942..24c7ce7 100644
--- a/page-templates/both-sidebarspage.php
+++ b/page-templates/both-sidebarspage.php
@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 
diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php
index aa09c1f..0f55bca 100644
--- a/page-templates/fullwidthpage.php
+++ b/page-templates/fullwidthpage.php
@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="full-width-page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 
diff --git a/page-templates/left-sidebarpage.php b/page-templates/left-sidebarpage.php
index c739c8e..4aeffd0 100644
--- a/page-templates/left-sidebarpage.php
+++ b/page-templates/left-sidebarpage.php
@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 
diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php
index 7aa91fb..f9630a4 100644
--- a/page-templates/right-sidebarpage.php
+++ b/page-templates/right-sidebarpage.php
@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 
diff --git a/page.php b/page.php
index a3f2518..6bd409c 100644
--- a/page.php
+++ b/page.php
@@ -19,7 +19,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
diff --git a/search.php b/search.php
index cd3c645..1817471 100644
--- a/search.php
+++ b/search.php
@@ -13,7 +13,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="search-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
diff --git a/sidebar-footerfull.php b/sidebar-footerfull.php
index 0483caf..2017f6f 100644
--- a/sidebar-footerfull.php
+++ b/sidebar-footerfull.php
@@ -15,7 +15,7 @@ $container   = get_theme_mod( 'understrap_container_type' );
 
 	<div class="wrapper" id="wrapper-footer-full">
 
-		<div class="<?php echo esc_html( $container ); ?>" id="footer-full-content" tabindex="-1">
+		<div class="<?php echo esc_attr( $container ); ?>" id="footer-full-content" tabindex="-1">
 
 			<div class="row">
 
diff --git a/sidebar-statichero.php b/sidebar-statichero.php
index b9256b5..cfe9e49 100644
--- a/sidebar-statichero.php
+++ b/sidebar-statichero.php
@@ -15,7 +15,7 @@ $container   = get_theme_mod( 'understrap_container_type' );
 
 	<div class="wrapper" id="wrapper-static-hero">
 
-			<div class="<?php echo esc_html( $container ); ?>" id="wrapper-static-content" tabindex="-1">
+			<div class="<?php echo esc_attr( $container ); ?>" id="wrapper-static-content" tabindex="-1">
 
 				<div class="row">
 
diff --git a/single.php b/single.php
index c9f3d8a..16f790d 100644
--- a/single.php
+++ b/single.php
@@ -12,7 +12,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="single-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
diff --git a/woocommerce.php b/woocommerce.php
index caaf8c1..6243f00 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -19,7 +19,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="woocommerce-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">