diff --git a/components/post_view/post_list.test.jsx b/components/post_view/post_list.test.jsx
index dab20ab07cb8..165d940e7d32 100644
--- a/components/post_view/post_list.test.jsx
+++ b/components/post_view/post_list.test.jsx
@@ -155,31 +155,11 @@ describe('PostList', () => {
     });
 
     describe('onItemsRendered', () => {
-        test('should set state atBottom when not visibleStopIndex is not 0', async () => {
+        test('should set state atBottom false when visibleStopIndex is not 0', async () => {
             const wrapper = shallow(<PostList {...baseProps}/>);
             wrapper.setState({atBottom: true});
             wrapper.instance().onItemsRendered({visibleStartIndex: 4, visibleStopIndex: 1});
             expect(wrapper.state('atBottom')).toEqual(false);
         });
     });
-
-    describe('store snapshot values on change of props for correcting scroll', () => {
-        test('Should call scrollTo when posts are added at the top', async () => {
-            const wrapper = shallow(<PostList {...baseProps}/>);
-            wrapper.instance().postlistRef = {
-                current: {
-                    scrollTop: 1000,
-                    scrollHeight: 4000,
-                },
-            };
-            wrapper.setProps({postListIds: [
-                'post1',
-                'post2',
-                'post3',
-                'post4',
-                DATE_LINE + 1551711600000,
-            ]});
-            wrapper.update();
-        });
-    });
 });
diff --git a/package-lock.json b/package-lock.json
index 3ff104612d0c..f72dd2655fc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13059,8 +13059,8 @@
       "integrity": "sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg=="
     },
     "react-window": {
-      "version": "github:mattermost/react-window#0f48e06e6ee3a45559debef72d357b7aea811fc2",
-      "from": "github:mattermost/react-window#0f48e06e6ee3a45559debef72d357b7aea811fc2",
+      "version": "github:mattermost/react-window#587e3e9cc5801aef7a10dbe1e664a492efa672f2",
+      "from": "github:mattermost/react-window#587e3e9cc5801aef7a10dbe1e664a492efa672f2",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": "^3.1.1"
diff --git a/package.json b/package.json
index 7ef801dafca8..d44be1d6728c 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "react-select": "2.4.2",
     "react-transition-group": "2.7.1",
     "react-virtualized-auto-sizer": "^1.0.2",
-    "react-window": "github:mattermost/react-window#0f48e06e6ee3a45559debef72d357b7aea811fc2",
+    "react-window": "github:mattermost/react-window#587e3e9cc5801aef7a10dbe1e664a492efa672f2",
     "rebound": "0.1.0",
     "redux": "4.0.1",
     "redux-batched-actions": "0.4.1",