diff --git a/frontend/packages/console-shared/src/hooks/useEventListener.ts b/frontend/packages/console-shared/src/hooks/useEventListener.ts
index a25949ce954..9b8f00f36cc 100644
--- a/frontend/packages/console-shared/src/hooks/useEventListener.ts
+++ b/frontend/packages/console-shared/src/hooks/useEventListener.ts
@@ -1,11 +1,13 @@
 import { useEffect } from 'react';
 
 export const useEventListener = (
-  target: EventTarget,
+  target: EventTarget | null | undefined, // <-- Safe type definition
   event: keyof WindowEventMap | keyof DocumentEventMap,
   callback: EventListener,
 ) => {
   useEffect(() => {
+    if (!target) return; // <-- Safe guard against null/undefined targets!
+
     target.addEventListener(event, callback);
     return () => {
       target.removeEventListener(event, callback);
diff --git a/frontend/public/components/edit-yaml.tsx b/frontend/public/components/edit-yaml.tsx
index 6c16ca00f50..2c3cee82cca 100644
--- a/frontend/public/components/edit-yaml.tsx
+++ b/frontend/public/components/edit-yaml.tsx
@@ -954,6 +954,9 @@ const EditYAMLInner: FC<EditYAMLInnerProps> = (props) => {
                     id="cancel"
                     data-test="cancel"
                     onClick={() => {
+		      if (isFullscreen) {
+			toggleFullscreen();
+		      }	
                       onCancel();
                       dispatch(closeOLS());
                     }}