diff --git a/public/app/core/components/Layers/LayerDragDropList.tsx b/public/app/core/components/Layers/LayerDragDropList.tsx
index e3ee75bf669..db89c48d440 100644
--- a/public/app/core/components/Layers/LayerDragDropList.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.tsx
@@ -16,7 +16,7 @@ type LayerDragDropListProps<T extends LayerElement> = {
   onSelect: (element: T) => any;
   onDelete: (element: T) => any;
   onDuplicate?: (element: T) => any;
-  isFrame?: (element: T) => boolean;
+  isFrame: (element: T) => boolean;
   selection?: string[]; // list of unique ids (names)
   excludeBaseLayer?: boolean;
   onNameChange: (element: T, newName: string) => any;
@@ -74,7 +74,7 @@ export const LayerDragDropList = <T extends LayerElement>({
                         />
                         <div className={style.textWrapper}>&nbsp; {getLayerInfo(element)}</div>
 
-                        {!isFrame!(element) && (
+                        {isFrame(element) && (
                           <>
                             {onDuplicate ? (
                               <IconButton
diff --git a/public/app/plugins/panel/geomap/editor/LayersEditor.tsx b/public/app/plugins/panel/geomap/editor/LayersEditor.tsx
index afad49655f9..2964160bae4 100644
--- a/public/app/plugins/panel/geomap/editor/LayersEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/LayersEditor.tsx
@@ -5,6 +5,7 @@ import { StandardEditorProps } from '@grafana/data';
 import { Container } from '@grafana/ui';
 import { AddLayerButton } from 'app/core/components/Layers/AddLayerButton';
 import { LayerDragDropList } from 'app/core/components/Layers/LayerDragDropList';
+import { FrameState } from 'app/features/canvas/runtime/frame';
 
 import { GeomapInstanceState } from '../GeomapPanel';
 import { geomapLayerRegistry } from '../layers/registry';
@@ -54,6 +55,10 @@ export const LayersEditor = (props: LayersEditorProps) => {
     element.onChange({ ...element.options, name });
   };
 
+  const isFrame = (element: MapLayerState<any>) => {
+    return element instanceof FrameState;
+  };
+
   const selection = selected ? [layers[selected]?.getName()] : [];
 
   return (
@@ -74,6 +79,7 @@ export const LayersEditor = (props: LayersEditorProps) => {
         onSelect={onSelect}
         onDelete={onDelete}
         selection={selection}
+        isFrame={isFrame}
         excludeBaseLayer
         onNameChange={onNameChange}
         verifyLayerNameUniqueness={actions.canRename}