diff --git a/src/wp-admin/css/site-health.css b/src/wp-admin/css/site-health.css
index ec345ec04b..520d276c43 100644
--- a/src/wp-admin/css/site-health.css
+++ b/src/wp-admin/css/site-health.css
@@ -393,11 +393,30 @@
 	display: none;
 }
 
+/* Better position for the WordPress admin notices and update nag. */
+.site-health .notice {
+	margin: 5px 20px 15px 22px;
+}
+
+.site-health .update-nag {
+	margin-bottom: 20px;
+	margin-left: 22px;
+}
+
 @media screen and (max-width: 782px) {
 	.health-check-body {
 		margin: 0 12px;
 		width: auto;
 	}
+
+	.site-health .notice {
+		margin: 5px 10px 15px;
+	}
+
+	.site-health .update-nag {
+		margin-right: 10px;
+		margin-left: 10px;
+	}
 }
 
 /* The breakpoint is usually at 960px, the additional space is to allow for the margin. */
diff --git a/src/wp-admin/site-health-info.php b/src/wp-admin/site-health-info.php
index 9bd9568dc5..06491c411a 100644
--- a/src/wp-admin/site-health-info.php
+++ b/src/wp-admin/site-health-info.php
@@ -56,6 +56,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	</nav>
 </div>
 
+<hr class="wp-header-end">
+
 <div class="notice notice-error hide-if-js">
 	<p><?php _e( 'The Site Health check requires JavaScript.' ); ?></p>
 </div>
diff --git a/src/wp-admin/site-health.php b/src/wp-admin/site-health.php
index 5450cba1c7..2a4fee18b5 100644
--- a/src/wp-admin/site-health.php
+++ b/src/wp-admin/site-health.php
@@ -61,6 +61,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	</nav>
 </div>
 
+<hr class="wp-header-end">
+
 <div class="notice notice-error hide-if-js">
 	<p><?php _e( 'The Site Health check requires JavaScript.' ); ?></p>
 </div>