diff --git src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
index d4f5a1157..ddc7549d6 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
@@ -64,13 +64,10 @@ body.buddypress {
 
 		.entry-header {
 			float: none;
-			max-width: none;
 		}
 
-		.entry-content,
-		.entry .entry-content > * {
+		.entry-content {
 			float: none;
-			max-width: none;
 		}
 
 		// 2017 has a very large top padding we'll reduce that for bp screens
diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index a9ad15225..bfe69c0e9 100644
--- src/bp-templates/bp-nouveau/css/buddypress-rtl.css
+++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css
@@ -89,12 +89,9 @@ body #buddypress .bp-list .action {
 	}
 	body.buddypress .entry-header {
 		float: none;
-		max-width: none;
 	}
-	body.buddypress .entry-content,
-	body.buddypress .entry .entry-content > * {
+	body.buddypress .entry-content {
 		float: none;
-		max-width: none;
 	}
 	body.buddypress .site-content {
 		padding-top: 2.5em;
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index e114e6877..161bedc75 100644
--- src/bp-templates/bp-nouveau/css/buddypress.css
+++ src/bp-templates/bp-nouveau/css/buddypress.css
@@ -89,12 +89,9 @@ body #buddypress .bp-list .action {
 	}
 	body.buddypress .entry-header {
 		float: none;
-		max-width: none;
 	}
-	body.buddypress .entry-content,
-	body.buddypress .entry .entry-content > * {
+	body.buddypress .entry-content {
 		float: none;
-		max-width: none;
 	}
 	body.buddypress .site-content {
 		padding-top: 2.5em;
diff --git src/bp-templates/bp-nouveau/includes/customizer.php src/bp-templates/bp-nouveau/includes/customizer.php
index a4dcbde6a..7a5bcd9d0 100644
--- src/bp-templates/bp-nouveau/includes/customizer.php
+++ src/bp-templates/bp-nouveau/includes/customizer.php
@@ -202,6 +202,16 @@ function bp_nouveau_customize_register( WP_Customize_Manager $wp_customize ) {
 		),
 	) );
 
+	if ( current_theme_supports( 'align-wide' ) ) {
+		$settings['bp_nouveau_appearance[global_alignment]'] = array(
+			'index'             => 'global_alignment',
+			'capability'        => 'bp_moderate',
+			'sanitize_callback' => 'sanitize_html_class',
+			'transport'         => 'refresh',
+			'type'              => 'option',
+		);
+	}
+
 	// Add the settings
 	foreach ( $settings as $id_setting => $setting_args ) {
 		$args = array();
@@ -296,6 +306,20 @@ function bp_nouveau_customize_register( WP_Customize_Manager $wp_customize ) {
 	 */
 	$controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
 
+	if ( current_theme_supports( 'align-wide' ) ) {
+		$controls['global_alignment'] = array(
+			'label'      => __( 'Select the BuddyPress container width for your site.', 'buddypress' ),
+			'section'    => 'bp_nouveau_general_settings',
+			'settings'   => 'bp_nouveau_appearance[global_alignment]',
+			'type'       => 'select',
+			'choices'    => array(
+				'alignnone' => __( 'Default width', 'buddypress' ),
+				'alignwide' => __( 'Wide width', 'buddypress' ),
+				'alignfull' => __( 'Full width', 'buddypress' ),
+			),
+		);
+	}
+
 	// Add the controls to the customizer's section
 	foreach ( $controls as $id_control => $control_args ) {
 		if ( empty( $control_args['class'] ) ) {
diff --git src/bp-templates/bp-nouveau/includes/functions.php src/bp-templates/bp-nouveau/includes/functions.php
index a4cd20aa8..1af8d9191 100644
--- src/bp-templates/bp-nouveau/includes/functions.php
+++ src/bp-templates/bp-nouveau/includes/functions.php
@@ -625,6 +625,7 @@ function bp_nouveau_get_temporary_setting( $option = '', $retval = false ) {
 function bp_nouveau_get_appearance_settings( $option = '' ) {
 	$default_args = array(
 		'avatar_style'       => 0,
+		'global_alignment'   => 'alignnone',
 		'user_front_page'    => 1,
 		'user_front_bio'     => 0,
 		'user_nav_display'   => 0, // O is default (horizontally). 1 is vertically.
diff --git src/bp-templates/bp-nouveau/includes/template-tags.php src/bp-templates/bp-nouveau/includes/template-tags.php
index 8662aa552..443d29bfd 100644
--- src/bp-templates/bp-nouveau/includes/template-tags.php
+++ src/bp-templates/bp-nouveau/includes/template-tags.php
@@ -1489,6 +1489,11 @@ function bp_nouveau_container_classes() {
 			}
 		}
 
+		$global_alignment = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
+		if ( $global_alignment && 'alignnone' !== $global_alignment && current_theme_supports( 'align-wide' ) ) {
+			$classes[] = $global_alignment;
+		}
+
 		$class = array_map( 'sanitize_html_class', $classes );
 
 		/**