diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index f1dd76ac31474..9d6fdeaf010e0 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -706,12 +706,22 @@ form#tags-filter {
 	font-weight: 600;
 }
 
+#post-status-select,
 #post-visibility-select,
 #comment-status-radio {
 	line-height: 1.5;
 	margin-top: 3px;
 }
 
+#post-status-select select {
+	max-width: 100%;
+	width: 100%;
+}
+
+#post-status-select .post-status-actions {
+	margin: 0.7em 0 0;
+}
+
 #linksubmitdiv .inside, /* Old Link Manager back-compat. */
 #poststuff #submitdiv .inside {
 	margin: 0;
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 535a00cd3fe94..ca81d369d8458 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -162,8 +162,10 @@ function post_submit_meta_box( $post, $args = array() ) {
 							<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
 						<?php endif; ?>
 					</select>
-					<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
-					<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+					<p class="post-status-actions">
+						<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+						<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+					</p>
 				</div>
 				<?php
 			}
diff --git a/tests/phpunit/tests/admin/includesMetaBoxes.php b/tests/phpunit/tests/admin/includesMetaBoxes.php
new file mode 100644
index 0000000000000..360220ef91af2
--- /dev/null
+++ b/tests/phpunit/tests/admin/includesMetaBoxes.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @group admin
+ */
+class Tests_Admin_IncludesMetaBoxes extends WP_UnitTestCase {
+	protected static $admin_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		require_once ABSPATH . 'wp-admin/includes/meta-boxes.php';
+
+		wp_set_current_user( self::$admin_id );
+	}
+
+	public function test_post_submit_meta_box_status_controls_keep_legacy_select_contract() {
+		$post   = self::factory()->post->create_and_get( array( 'post_status' => 'draft' ) );
+		$output = $this->get_post_submit_meta_box_output( $post );
+
+		$this->assertStringContainsString( '<select name="post_status" id="post_status">', $output );
+		$this->assertStringNotContainsString( '<fieldset id="post_status"', $output );
+		$this->assertStringContainsString( '<option selected=\'selected\' value=\'draft\'>Draft</option>', $output );
+		$this->assertStringContainsString( '<option value=\'pending\'>Pending Review</option>', $output );
+
+		$this->assertMatchesRegularExpression(
+			'/<select name="post_status" id="post_status">.*value=\'pending\'.*value=\'draft\'.*<\/select>/s',
+			$output
+		);
+		$this->assertMatchesRegularExpression(
+			'/<\/select>\s*<p class="post-status-actions">\s*<a href="#post_status" class="save-post-status hide-if-no-js button">OK<\/a>\s*<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel">Cancel<\/a>\s*<\/p>/',
+			$output
+		);
+	}
+
+	private function get_post_submit_meta_box_output( WP_Post $post ) {
+		$GLOBALS['post'] = $post;
+
+		ob_start();
+		post_submit_meta_box( $post );
+		return ob_get_clean();
+	}
+}