diff --git a/src/components/scroll-region.cjsx b/src/components/scroll-region.cjsx
index aa8b2ebdf..ed9f28af1 100644
--- a/src/components/scroll-region.cjsx
+++ b/src/components/scroll-region.cjsx
@@ -100,6 +100,7 @@ class Scrollbar extends React.Component
     bottom: 0
     right: 0
     zIndex: 2
+    visibility: "hidden" if @state.totalHeight != 0 && @state.totalHeight == @state.viewportHeight
 
   _onHandleDown: (event) =>
     handleNode = React.findDOMNode(@refs.handle)
@@ -197,6 +198,10 @@ class ScrollRegion extends React.Component
       attributeFilter: ['style']
     })
 
+  componentDidUpdate: (prevProps, prevState) =>
+    if (@props.children != prevProps.children)
+      @recomputeDimensions()
+
   componentWillReceiveProps: (props) =>
     if @shouldInvalidateScrollbarComponent(props)
       @_scrollbarComponent = null