2 files changed, 11 insertions, 13 deletions

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 035899592..8b5fc4162 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -51,7 +51,7 @@ export default class CreatePost extends React.Component {
             submitting: false,
             initialText: draft.messageText,
             windowWidth: Utils.windowWidth(),
-            windowHeigth: Utils.windowHeight()
+            windowHeight: Utils.windowHeight()
         };
     }
     handleResize() {
@@ -71,7 +71,7 @@ export default class CreatePost extends React.Component {
             return;
         }
 
-        if (prevState.windowWidth !== this.state.windowWidth || prevState.windowHeight !== this.state.windowHeigth) {
+        if (prevState.windowWidth !== this.state.windowWidth || prevState.windowHeight !== this.state.windowHeight) {
             this.resizePostHolder();
             return;
         }
@@ -208,7 +208,7 @@ export default class CreatePost extends React.Component {
         PostStore.storeCurrentDraft(draft);
     }
     resizePostHolder() {
-        const height = this.state.windowHeigth - $(ReactDOM.findDOMNode(this.refs.topDiv)).height() - 50;
+        const height = this.state.windowHeight - $(ReactDOM.findDOMNode(this.refs.topDiv)).height() - 50;
         $('.post-list-holder-by-time').css('height', `${height}px`);
         if (this.state.windowWidth > 960) {
             $('#post_textbox').focus();
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 5a4e8abaf..b7df483e9 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -151,7 +151,7 @@ export default class PostList extends React.Component {
             this.loadFirstPosts(this.props.channelId);
         }
 
-        this.handleResize();
+        this.resizePostList();
         this.onChange();
         this.scrollToBottom();
     }
@@ -172,6 +172,13 @@ export default class PostList extends React.Component {
             return;
         }
 
+        if (prevState.windowHeight !== this.state.windowHeight) {
+            this.resizePostList();
+            if (!this.scrolled) {
+                this.scrollToBottom();
+            }
+        }
+
         $('.post-list__content div .post').removeClass('post--last');
         $('.post-list__content div:last-child .post').addClass('post--last');
 
@@ -218,10 +225,6 @@ export default class PostList extends React.Component {
         } else {
             this.scrollTo(this.prevScrollTop);
         }
-
-        if (prevState.windowHeight !== this.state.windowHeight) {
-            this.handleResize();
-        }
     }
     componentWillUpdate() {
         var postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
@@ -238,11 +241,6 @@ export default class PostList extends React.Component {
         this.setState({
             windowHeight: Utils.windowHeight()
         });
-
-        this.resizePostList();
-        if (!this.scrolled) {
-            this.scrollToBottom();
-        }
     }
     resizePostList() {
         const postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));