diff --git a/js/file_browser.view.js b/js/file_browser.view.js
index ced2472..92188bb 100644
--- a/js/file_browser.view.js
+++ b/js/file_browser.view.js
@@ -17,6 +17,13 @@
       // Indicate that images are loading.
       $view.append('<div class="ajax-progress ajax-progress-fullscreen">&nbsp;</div>');
       $view.imagesLoaded(function () {
+        // Save the scroll position.
+        var scroll = document.body.scrollTop;
+        // Remove old Masonry object if it exists. This allows modules like
+        // Views Infinite Scroll to function with File Browser.
+        if ($view.data('masonry')) {
+          $view.masonry('destroy');
+        }
         $view.masonry({
           columnWidth: '.grid-sizer',
           gutter: '.gutter-sizer',
@@ -24,6 +31,8 @@
           percentPosition: true,
           isFitWidth:true
         });
+        // Jump to the old scroll position.
+        document.body.scrollTop = scroll;
         // Add a class to reveal the loaded images, which avoids FOUC.
         $('.grid-item').addClass('item-style');
         $view.find('.ajax-progress').remove();