diff --git a/src/ui/component/claimList/view.jsx b/src/ui/component/claimList/view.jsx
index f13fd7127..209f87248 100644
--- a/src/ui/component/claimList/view.jsx
+++ b/src/ui/component/claimList/view.jsx
@@ -1,5 +1,6 @@
 // @flow
 import { MAIN_WRAPPER_CLASS } from 'component/app/view';
+import { MAIN_CLASS } from 'component/page/view';
 import type { Node } from 'react';
 import React, { useEffect, useState } from 'react';
 import classnames from 'classnames';
@@ -10,6 +11,7 @@ import usePersistedState from 'effects/use-persisted-state';
 
 const SORT_NEW = 'new';
 const SORT_OLD = 'old';
+const PADDING_ALLOWANCE = 100;
 
 type Props = {
   uris: Array<string>,
@@ -61,8 +63,14 @@ export default function ClaimList(props: Props) {
     function handleScroll(e) {
       if (page && pageSize && onScrollBottom && !scrollBottomCbMap[page]) {
         const x = document.querySelector(`.${MAIN_WRAPPER_CLASS}`);
+        const mc = document.querySelector(`.${MAIN_CLASS}`);
 
-        if (x && window.scrollY + window.innerHeight >= x.offsetHeight) {
+        if (
+          x &&
+          mc &&
+          (window.scrollY + window.innerHeight >= x.offsetHeight ||
+            x.offsetHeight - mc.offsetHeight > PADDING_ALLOWANCE)
+        ) {
           if (!loading && urisLength >= pageSize) {
             onScrollBottom();
 
diff --git a/src/ui/component/page/view.jsx b/src/ui/component/page/view.jsx
index acb516843..ca78f6cf5 100644
--- a/src/ui/component/page/view.jsx
+++ b/src/ui/component/page/view.jsx
@@ -5,6 +5,7 @@ import classnames from 'classnames';
 import SideBar from 'component/sideBar';
 import Header from 'component/header';
 
+export const MAIN_CLASS = 'main';
 type Props = {
   children: Node | Array<Node>,
   className: ?string,
@@ -22,7 +23,7 @@ function Page(props: Props) {
     <Fragment>
       <Header authHeader={authPage} />
       <div className={classnames('main-wrapper__inner')}>
-        <main className={classnames('main', className, { 'main--full-width': authPage })}>{children}</main>
+        <main className={classnames(MAIN_CLASS, className, { 'main--full-width': authPage })}>{children}</main>
         {!authPage && <SideBar obscureSideBar={obscureSideBar} />}
       </div>
     </Fragment>