diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index dda9f0b29d..16a2e5e10f 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -127,7 +127,6 @@ final class _WP_Editors {
 
 		if ( !empty($buttons) || $set['media_buttons'] ) {
 			echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
-			echo $buttons;
 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
@@ -139,6 +138,8 @@ final class _WP_Editors {
 				do_action('media_buttons', $editor_id);
 				echo "</div>\n";
 			}
+
+			echo '<div class="wp-editor-tabs">' . $buttons . "</div>\n";
 			echo "</div>\n";
 		}
 
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index 5ed143e7c5..8ed36fe566 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1114,6 +1114,10 @@ span.mce_ltr:before {
 	background: #f5f5f5;
 }
 
+.wp-editor-tabs {
+	float: right;
+}
+
 .wp-switch-editor {
 	background: #ebebeb;
 	border: 1px solid #dedede;
@@ -1151,6 +1155,10 @@ span.mce_ltr:before {
 	border-bottom: none;
 }
 
+.wp-media-buttons {
+	float: left;
+}
+
 .wp-media-buttons .button {
 	margin-right: 5px;
 	margin-bottom: 4px;