diff --git a/src/components/scroll-region.cjsx b/src/components/scroll-region.cjsx
index 9ce4d6c9a..8347729e4 100644
--- a/src/components/scroll-region.cjsx
+++ b/src/components/scroll-region.cjsx
@@ -31,7 +31,7 @@ class Scrollbar extends React.Component
       'scrolling': @state.scrolling
 
     tooltip = []
-    if @props.scrollTooltipComponent
+    if @props.scrollTooltipComponent and @state.dragging
       tooltip = <@props.scrollTooltipComponent viewportCenter={@state.viewportScrollTop + @state.viewportHeight / 2} totalHeight={@state.totalHeight} />
 
     <div className={containerClasses} style={@_scrollbarWrapStyles()} onMouseEnter={@recomputeDimensions}>