diff --git a/ui/src/flux/components/BodyBuilder.tsx b/ui/src/flux/components/BodyBuilder.tsx
index e06965628b..bc2c8f9c95 100644
--- a/ui/src/flux/components/BodyBuilder.tsx
+++ b/ui/src/flux/components/BodyBuilder.tsx
@@ -1,6 +1,7 @@
 import React, {PureComponent} from 'react'
 import _ from 'lodash'
 
+import FancyScrollbar from 'src/shared/components/FancyScrollbar'
 import ExpressionNode from 'src/flux/components/ExpressionNode'
 import VariableName from 'src/flux/components/VariableName'
 import FuncSelector from 'src/flux/components/FuncSelector'
@@ -62,18 +63,20 @@ class BodyBuilder extends PureComponent<Props> {
     })
 
     return (
-      <div className="body-builder">
-        {_.flatten(bodybuilder)}
-        <div className="declaration">
-          <FuncSelector
-            bodyID="fake-body-id"
-            declarationID="fake-declaration-id"
-            onAddNode={this.createNewBody}
-            funcs={this.newDeclarationFuncs}
-            connectorVisible={false}
-          />
+      <FancyScrollbar className="body-builder--container" autoHide={true}>
+        <div className="body-builder">
+          {_.flatten(bodybuilder)}
+          <div className="declaration">
+            <FuncSelector
+              bodyID="fake-body-id"
+              declarationID="fake-declaration-id"
+              onAddNode={this.createNewBody}
+              funcs={this.newDeclarationFuncs}
+              connectorVisible={false}
+            />
+          </div>
         </div>
-      </div>
+      </FancyScrollbar>
     )
   }