diff --git a/apps/client/src/ee/base/styles/grid.module.css b/apps/client/src/ee/base/styles/grid.module.css
index 9f17b2f1a..a07d95971 100644
--- a/apps/client/src/ee/base/styles/grid.module.css
+++ b/apps/client/src/ee/base/styles/grid.module.css
@@ -241,7 +241,7 @@
   padding: 0;
 }
 
-.cellFocused {
+.bodyGrid:focus-within .cellFocused {
   outline: 2px solid var(--mantine-color-blue-5);
   outline-offset: -2px;
   z-index: 1;