diff --git a/ui/src/shared/components/LayoutCellMenu.tsx b/ui/src/shared/components/LayoutCellMenu.tsx
index 6853b6a44..8253ad04e 100644
--- a/ui/src/shared/components/LayoutCellMenu.tsx
+++ b/ui/src/shared/components/LayoutCellMenu.tsx
@@ -69,13 +69,7 @@ class LayoutCellMenu extends Component<Props, State> {
   }
 
   private get renderMenu(): JSX.Element {
-    const {
-      isEditable,
-      mode,
-      cell,
-      onDismissEditingAnnotation,
-      queries,
-    } = this.props
+    const {isEditable, mode, cell, onDismissEditingAnnotation} = this.props
 
     if (mode === EDITING && cellSupportsAnnotations(cell.type)) {
       return (
@@ -93,13 +87,7 @@ class LayoutCellMenu extends Component<Props, State> {
     if (isEditable && mode !== EDITING) {
       return (
         <div className="dash-graph-context--buttons">
-          {queries.length ? (
-            <MenuTooltipButton
-              icon="pencil"
-              menuItems={this.editMenuItems}
-              informParent={this.handleToggleSubMenu}
-            />
-          ) : null}
+          {this.pencilMenu}
           <Authorized requiredRole={EDITOR_ROLE}>
             <MenuTooltipButton
               icon="duplicate"
@@ -118,6 +106,22 @@ class LayoutCellMenu extends Component<Props, State> {
     }
   }
 
+  private get pencilMenu(): JSX.Element {
+    const {queries} = this.props
+
+    if (!queries.length) {
+      return
+    }
+
+    return (
+      <MenuTooltipButton
+        icon="pencil"
+        menuItems={this.editMenuItems}
+        informParent={this.handleToggleSubMenu}
+      />
+    )
+  }
+
   private get contextMenuClassname(): string {
     const {subMenuIsOpen} = this.state