diff --git a/frontend/packages/console-shared/src/components/popper/Popper.tsx b/frontend/packages/console-shared/src/components/popper/Popper.tsx
index bcf95ed55b6..015edbd3bd4 100644
--- a/frontend/packages/console-shared/src/components/popper/Popper.tsx
+++ b/frontend/packages/console-shared/src/components/popper/Popper.tsx
@@ -89,12 +89,12 @@ const Popper: React.FC<PopperProps> = ({
   returnFocus,
 }) => {
   const controlled = typeof open === 'boolean';
-  const openProp = controlled ? open : true;
+  const openProp = controlled ? open || false : true;
   const nodeRef = React.useRef<Element>();
   const popperRef = React.useRef<PopperJS>(null);
   const popperRefs = useCombineRefs<PopperJS>(popperRef, popperRefIn);
   const [isOpen, setOpenState] = React.useState(openProp);
-  const focusRef = React.useRef<Element>();
+  const focusRef = React.useRef<Element | null>();
   const onRequestCloseRef = React.useRef(onRequestClose);
   onRequestCloseRef.current = onRequestClose;
 
diff --git a/frontend/packages/topology/src/components/GraphComponent.tsx b/frontend/packages/topology/src/components/GraphComponent.tsx
index 8bf8c9d4d95..1b1480aa3a7 100644
--- a/frontend/packages/topology/src/components/GraphComponent.tsx
+++ b/frontend/packages/topology/src/components/GraphComponent.tsx
@@ -4,7 +4,6 @@ import { Graph } from '../types';
 import { WithPanZoomProps } from '../behavior/usePanZoom';
 import { WithDndDropProps } from '../behavior/useDndDrop';
 import { WithSelectionProps } from '../behavior/useSelection';
-import useCombineRefs from '../utils/useCombineRefs';
 import { WithContextMenuProps } from '../behavior/withContextMenu';
 import LayersProvider from './layers/LayersProvider';
 import { DEFAULT_LAYER } from './layers/LayersContext';
@@ -50,7 +49,6 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
   onContextMenu,
 }) => {
   const layout = element.getLayout();
-  const refs = useCombineRefs<SVGPathElement>(panZoomRef, dndDropRef);
   React.useEffect(() => {
     element.layout();
     // Only re-run if the layout changes
@@ -61,6 +59,7 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
   return (
     <>
       <rect
+        ref={dndDropRef}
         x={0}
         y={0}
         width={bounds.width}
@@ -71,7 +70,7 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
       />
       <g
         data-surface="true"
-        ref={refs}
+        ref={panZoomRef}
         transform={`translate(${bounds.x}, ${bounds.y}) scale(${element.getScale()})`}
       >
         <Inner element={element} />