diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 51fee851f3..b57b659136 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -647,6 +647,9 @@ module.exports = React.createClass({
             // update the scrollPanel, we tell it to apply
             // the shrinking prevention once the typing notifs are hidden
             scrollPanel.updatePreventShrinking();
+            // order is important here as checkScroll will scroll down to
+            // reveal added padding to balance the notifs disappearing.
+            scrollPanel.checkScroll();
         }
     },
 
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index d322a83225..f33fec9d8a 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -789,9 +789,6 @@ module.exports = React.createClass({
                 const offsetDiff = offsetFromBottom - currentOffset;
                 if (offsetDiff > 0) {
                     balanceElement.style.paddingBottom = `${offsetDiff}px`;
-                    if (this.scrollState.stuckAtBottom) {
-                        sn.scrollTop = sn.scrollHeight;
-                    }
                     debuglog("update prevent shrinking ", offsetDiff, "px from bottom");
                 } else if (offsetDiff < 0) {
                     shouldClear = true;