diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index 5f8520d845d..f317970a8ec 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -21,20 +21,6 @@
 
 .wc-addons-wrap {
 
-	&.wrap {
-
-		padding-top: 0 !important;
-
-		.woocommerce-message {
-			margin-left: 20px;
-			margin-right: 20px;
-
-			&:first-of-type {
-				margin-top: 32px;
-			}
-		}
-	}
-
 	.marketplace-header {
 		background-image: url(../images/marketplace-header-bg@2x.png);
 		background-position: right;
@@ -553,10 +539,6 @@
 	}
 
 	.marketplace-content-wrapper {
-		padding: 0 20px;
-	}
-
-	.marketplace-content {
 		margin: 0 auto;
 		max-width: 1032px;
 		width: 100%;
@@ -678,30 +660,22 @@
 	}
 }
 
-.woocommerce-embed-page {
-
-	.wc-addons-wrap.wrap {
-		padding: 0;
-	}
-}
-
 .wc-subscriptions-wrap {
 	max-width: 1200px;
 }
 
 .woocommerce-page-wc-marketplace {
 
-	.woocommerce-layout {
-		display: none;
-	}
-
 	.notice {
 		margin-left: 20px;
 		margin-right: 20px;
 	}
 
-	.wp-header-end {
-		margin-top: -16px;
+	&.woocommerce-page {
+
+		.wrap {
+			margin-top: 32px;
+		}
 	}
 }
 
diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php
index 6a89522bf01..aa1b3c2df72 100644
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 ?>
-<div class="wrap woocommerce wc-addons-wrap">
+<div class="woocommerce wc-addons-wrap">
 	<h1 class="screen-reader-text"><?php esc_html_e( 'Marketplace', 'woocommerce' ); ?></h1>
 
 	<?php if ( $sections ) : ?>
@@ -36,8 +36,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 	<div class="wp-header-end"></div>
 
-	<div class="marketplace-content-wrapper">
-		<div class="marketplace-content">
+	<div class="wrap">
+		<div class="marketplace-content-wrapper">
 			<?php if ( isset( $_GET['search'] ) ) : // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>
 				<h1 class="search-form-title">
 					<?php // translators: search keyword. ?>