diff --git a/client/src/app/components/PageDrawerContext.tsx b/client/src/app/components/PageDrawerContext.tsx
index 7a6c95ed05..a7bb01da55 100644
--- a/client/src/app/components/PageDrawerContext.tsx
+++ b/client/src/app/components/PageDrawerContext.tsx
@@ -160,9 +160,11 @@ export const PageDrawerContent: React.FC<IPageDrawerContentProps> = ({
   }, [drawerPanelContentProps, setDrawerPanelContentProps]);
 
   // If the drawer is already expanded describing app A, then the user clicks app B, we want to send focus back to the drawer.
-  React.useEffect(() => {
-    drawerFocusRef?.current?.focus();
-  }, [drawerFocusRef, focusKey]);
+
+  // TODO: This introduces a layout issue bug when clicking in between the columns of a table.
+  // React.useEffect(() => {
+  //   drawerFocusRef?.current?.focus();
+  // }, [drawerFocusRef, focusKey]);
 
   React.useEffect(() => {
     const drawerHead = header === null ? children : header;