diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 65005d6f617..fd7e296efde 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -50,7 +50,11 @@ window.startSpinner = ->
 window.stopSpinner = ->
   $('.turbolink-spinner').fadeOut()
 
+window.stopEndlessScroll = ->
+  $(document).unbind('scroll')
+
 document.addEventListener("page:fetch", startSpinner)
+document.addEventListener("page:fetch", stopEndlessScroll)
 document.addEventListener("page:receive", stopSpinner)
 
 $ ->