diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
index 2d79881..98c8ce3 100644
--- a/js/infinite-scroll.js
+++ b/js/infinite-scroll.js
@@ -10,6 +10,9 @@
   // The selector for the automatic pager.
   var automatic_pager_selector = '.infinite-scroll-automatic-pager';
 
+  // The selector for both manual load and automatic pager.
+  var pager_selector = '.infinite-scroll-pager';
+
   // The selector for the automatic pager.
   var content_wrapper_selector = '.views-infinite-scroll-content-wrapper';
 
@@ -20,21 +23,22 @@
    * Insert a views infinite scroll view into the document.
    */
   $.fn.infiniteScrollInsertView = function ($new_view) {
-    var currentViewID = this.selector.replace('.js-view-dom-id-', 'views_dom_id:');
+    var current_view_id = this.selector.replace('.js-view-dom-id-', 'views_dom_id:');
     // Get the existing ajaxViews object.
-    var view = Drupal.views.instances[currentViewID];
+    var view = Drupal.views.instances[current_view_id];
     // Remove once so that the exposed form and pager are processed on
     // behavior attach.
     view.$view.removeOnce('ajax-pager');
     view.$exposed_form.removeOnce('exposed-form');
     // Make sure infinite scroll can be reinitialized.
-    var $existing_pager = view.$view.find(automatic_pager_selector).removeOnce('infinite-scroll');
+    var $existing_pager = view.$view.find(pager_selector);
+    $existing_pager.removeOnce('infinite-scroll');
 
-    var $newRows = $new_view.find(content_wrapper_selector).children();
+    var $new_rows = $new_view.find(content_wrapper_selector).children();
     var $new_pager = $new_view.find('.js-pager__items');
 
     // Add the new rows to existing view.
-    view.$view.find(content_wrapper_selector).append($newRows);
+    view.$view.find(content_wrapper_selector).append($new_rows);
     // Replace the pager link with the new link and ajaxPageState values.
     $existing_pager.replaceWith($new_pager);
 
diff --git a/templates/views-infinite-scroll-pager.html.twig b/templates/views-infinite-scroll-pager.html.twig
index ea7b01d..b1cdde2 100644
--- a/templates/views-infinite-scroll-pager.html.twig
+++ b/templates/views-infinite-scroll-pager.html.twig
@@ -6,7 +6,7 @@
 #}
 
 {% if items.next %}
-<ul class="js-pager__items pager{% if options.automatically_load_content %} infinite-scroll-automatic-pager{% endif %}">
+<ul class="js-pager__items pager infinite-scroll-pager{% if options.automatically_load_content %} infinite-scroll-automatic-pager{% endif %}">
   <li class="pager__item">
     <a class="button" href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next">{{ options.button_text }}</a>
   </li>