diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index c7a5ce4228..f13202c9f2 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -235,11 +235,22 @@
 }
 
 .media-toolbar-secondary {
+	position: relative;
 	float: left;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding-right: 20px;
 	height: 100%;
 	max-width: 66%;
 }
 
+.media-toolbar-secondary .spinner {
+	position: absolute;
+	top: 2px;
+	right: 0px;
+}
+
 .media-toolbar-primary > .media-button,
 .media-toolbar-primary > .media-button-group {
 	margin-left: 10px;
@@ -740,6 +751,7 @@
 	margin-top: 11px;
 	margin-right: 2%;
 	max-width: 47%;
+	width: 100%; /* prevents options from invisibly taking up horizontal space */
 }
 
 /**
@@ -2359,7 +2371,7 @@
 	}
 
 	.media-modal .attachments-browser .media-toolbar .spinner {
-		margin: 14px 8px 0;
+		margin: 14px 0 0;
 	}
 
 	/* Text inputs need to be 16px, or they force zooming on iOS */