diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index ecac256426..ec6ba6fb80 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -1431,7 +1431,6 @@
 /**
  * Spinner
  */
-
 .media-frame .spinner {
 	background: url(../images/spinner.gif) no-repeat;
 	-webkit-background-size: 20px 20px;
@@ -1653,7 +1652,6 @@
 /**
  * Image Editor
  */
-
 .media-modal .imgedit-wrap {
 	position: static;
 }
@@ -2138,9 +2136,6 @@
 	font-family: Arial, sans-serif;
 }
 
-
-
-
 @media only screen and (max-width: 960px) {
 	.media-frame-content .media-toolbar-primary .search,
 	.media-frame-content .media-toolbar-secondary .attachment-filters {
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 230794383a..8a1e2eecff 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -4798,7 +4798,7 @@
 		arrowEvent: function( event ) {
 			var attachment = $('.attachments-browser .attachment'),
 				attachmentsWidth = $('.attachments-browser .attachments').width(),
-				thumbnailWidth = attachment.first().width(),
+				thumbnailWidth = attachment.first().outerWidth(),
 				thumbnailsPerRow = Math.round( attachmentsWidth / thumbnailWidth ),
 				totalThumnails = attachment.length,
 				totalRows = Math.ceil(totalThumnails/thumbnailsPerRow),