diff --git a/ui/src/dashboards/components/CellEditorOverlay.js b/ui/src/dashboards/components/CellEditorOverlay.js
index ce9c7a3e50..b0bd5a47f9 100644
--- a/ui/src/dashboards/components/CellEditorOverlay.js
+++ b/ui/src/dashboards/components/CellEditorOverlay.js
@@ -117,21 +117,23 @@ class CellEditorOverlay extends Component {
             cellName={cellWorkingName}
           />
           <ResizeBottom>
-            <OverlayControls
-              selectedGraphType={cellWorkingType}
-              onSelectGraphType={this.handleSelectGraphType}
-              onCancel={onCancel}
-              onSave={this.handleSaveCell}
-            />
-            <QueryBuilder
-              queries={queriesWorkingDraft}
-              actions={queryActions}
-              autoRefresh={autoRefresh}
-              timeRange={timeRange}
-              setActiveQueryIndex={this.handleSetActiveQueryIndex}
-              onDeleteQuery={this.handleDeleteQuery}
-              activeQueryIndex={activeQueryIndex}
-            />
+            <div>
+              <OverlayControls
+                selectedGraphType={cellWorkingType}
+                onSelectGraphType={this.handleSelectGraphType}
+                onCancel={onCancel}
+                onSave={this.handleSaveCell}
+              />
+              <QueryBuilder
+                queries={queriesWorkingDraft}
+                actions={queryActions}
+                autoRefresh={autoRefresh}
+                timeRange={timeRange}
+                setActiveQueryIndex={this.handleSetActiveQueryIndex}
+                onDeleteQuery={this.handleDeleteQuery}
+                activeQueryIndex={activeQueryIndex}
+              />
+            </div>
           </ResizeBottom>
         </ResizeContainer>
       </div>