diff --git a/core/themes/claro/css/components/tables.css b/core/themes/claro/css/components/tables.css
index 5e89b8e741e0348ae8be51681abf645de6fffb5d..aac1a6bd13dc1872d8ac9077484ef78749896af2 100644
--- a/core/themes/claro/css/components/tables.css
+++ b/core/themes/claro/css/components/tables.css
@@ -130,7 +130,7 @@ tr {
 }
 
 tr:hover,
-tr:focus {
+tr:focus-within {
   color: var(--color-text);
   background: var(--color-bgblue-hover);
 }
diff --git a/core/themes/claro/css/components/tables.pcss.css b/core/themes/claro/css/components/tables.pcss.css
index 0d3e522db80d89ca531f70b4b1d1a3ad96464805..14a0388054a6d3d54b7faf88348133db47a0d953 100644
--- a/core/themes/claro/css/components/tables.pcss.css
+++ b/core/themes/claro/css/components/tables.pcss.css
@@ -109,7 +109,7 @@ th {
 tr {
   border-bottom: 0.0625rem solid var(--color-gray-200);
   &:hover,
-  &:focus {
+  &:focus-within {
     color: var(--color-text);
     background: var(--color-bgblue-hover);
   }