diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 6654f32cc8..8d39b0e3c3 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -2600,11 +2600,26 @@
 
 .media-frame.mode-select .attachments-browser.fixed .media-toolbar {
 	position: fixed;
-	top: 12px;
+	top: 32px;
 	left: auto;
 	right: 20px;
+	margin-top: 0;
 }
 
+@media only screen and ( max-width: 782px ) {
+	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
+		top: 46px;
+		right: 10px;
+	}
+}
+
+@media only screen and (max-width: 600px) {
+	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
+		top: 0;
+	}
+}
+
+
 .media-frame.mode-grid input[type="search"] {
 	margin: 1px;
 	padding: 3px 5px;
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 9d982b3d41..0cb0654ff2 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -67,7 +67,7 @@
 
 			this.$window = $( window );
 			this.$adminBar = $( '#wpadminbar' );
-			this.$window.on( 'scroll', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
+			this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
 			$( document ).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) );
 
 			// Ensure core and media grid view UI is enabled.