diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
index 74253a2..a178b47 100644
--- a/js/infinite-scroll.js
+++ b/js/infinite-scroll.js
@@ -18,9 +18,9 @@
    */
   $.fn.infiniteScrollInsertView = function ($new_view) {
     var $existing_view = this;
-    var $existing_content = $existing_view.find('.view-content').children();
+    var $existing_content = $existing_view.find('.view-content-wrapper').children();
     $existing_view.css('height', $existing_view.height() + 'px');
-    $new_view.find('.view-content').prepend($existing_content);
+    $new_view.find('.view-content-wrapper').prepend($existing_content);
     $existing_view.replaceWith($new_view);
     $(document).trigger('infiniteScrollComplete', [$new_view, $existing_content]);
   };
diff --git a/views_infinite_scroll.module b/views_infinite_scroll.module
index 425aeb0..798a2dc 100644
--- a/views_infinite_scroll.module
+++ b/views_infinite_scroll.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Url;
+use Drupal\views_infinite_scroll\Plugin\views\pager\InfiniteScroll;
 
 /**
  * Implements hook_preprocess_views_infinite_scroll_pager().
@@ -24,3 +25,18 @@ function views_infinite_scroll_preprocess_views_infinite_scroll_pager(&$vars) {
   }
   $vars['#cache']['contexts'][] = 'url.query_args';
 }
+
+/**
+ * Implements template_preprocess_views_view().
+ */
+function views_infinite_scroll_preprocess_views_view(&$vars) {
+  $view = $vars['view'];
+  $display = $view->getDisplay();
+  if ($display->isPagerEnabled()) {
+    $pager = $view->getPager();
+    if ($pager && $pager instanceof InfiniteScroll) {
+      $vars['rows']['#prefix'] = '<div class="view-content-wrapper">';
+      $vars['rows']['#suffix'] = '</div>';
+    }
+  }
+}