diff --git a/src/components/context_menu/context_menu_panel.tsx b/src/components/context_menu/context_menu_panel.tsx
index 8840760618f..6d1c7d47eaf 100644
--- a/src/components/context_menu/context_menu_panel.tsx
+++ b/src/components/context_menu/context_menu_panel.tsx
@@ -299,6 +299,10 @@ export class EuiContextMenuPanel extends Component<Props, State> {
     }
   };
 
+  componentDidUpdate() {
+    this.updateFocus();
+  }
+
   componentDidMount() {
     this.updateFocus();
     this.reclaimPopoverFocus();
@@ -413,10 +417,6 @@ export class EuiContextMenuPanel extends Component<Props, State> {
     }
   }
 
-  componentDidUpdate() {
-    this.updateFocus();
-  }
-
   panelRef = (node: HTMLElement | null) => {
     this.panel = node;