diff --git a/src/Explorer/Panes/PanelContainerComponent.tsx b/src/Explorer/Panes/PanelContainerComponent.tsx
index 4ddc59033..7652053b4 100644
--- a/src/Explorer/Panes/PanelContainerComponent.tsx
+++ b/src/Explorer/Panes/PanelContainerComponent.tsx
@@ -1,4 +1,5 @@
 import { IPanelProps, IRenderFunction, Panel, PanelType } from "@fluentui/react";
+import { useSelectedNode } from "Explorer/useSelectedNode";
 import * as React from "react";
 import { useNotificationConsole } from "../../hooks/useNotificationConsole";
 import { useSidePanel } from "../../hooks/useSidePanel";
@@ -77,11 +78,19 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
   }
 
   private onDissmiss = (ev?: KeyboardEvent | React.SyntheticEvent<HTMLElement>): void => {
+    const targetElementDataTest = useSelectedNode.getState().findSelectedCollection().id();
+    const targetElement: HTMLElement = document.querySelector(`[data-test="${targetElementDataTest}"]`);
     if (ev && (ev.target as HTMLElement).id === "notificationConsoleHeader") {
       ev.preventDefault();
     } else {
       useSidePanel.getState().closeSidePanel();
     }
+    if (targetElement) {
+      const moreButton: HTMLElement = targetElement.querySelector('[name="More"]');
+      if (moreButton) {
+        moreButton.focus();
+      }
+    }
   };
 
   private getPanelHeight = (): string => {