X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7df2da959b583d3646b9fde606f9e74d598d4bb9..3f9aa0401350fc8a41a2dce81151da4aa050e771:/apps/workbench/app/assets/javascripts/infinite_scroll.js

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 3e15c9d970..64a90e2255 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -42,7 +42,8 @@ $(document).
     on('ready ajax:complete', function() {
         $('[data-infinite-scroller]').each(function() {
             var $scroller = $($(this).attr('data-infinite-scroller'));
-            if (!$scroller.hasClass('smart-scroll'))
+            if (!$scroller.hasClass('smart-scroll') &&
+		'scroll' != $scroller.css('overflow-y'))
                 $scroller = $(window);
             $scroller.
                 addClass('infinite-scroller').