diff --git a/lib/RepeatableField/RepeatableField.js b/lib/RepeatableField/RepeatableField.js
index 666aaddf3..c8cf5af12 100644
--- a/lib/RepeatableField/RepeatableField.js
+++ b/lib/RepeatableField/RepeatableField.js
@@ -35,6 +35,7 @@ const RepeatableField = ({
   const fieldsLength = fields.length;
   const isSomeChildElementFocused = useIsElementFocused(rootRef);
   const focusedIndex = useFocusedIndex(fieldsLength);
+  const hasToBeFocused = (index) => isSomeChildElementFocused && focusedIndex === index;
 
   return (
     <fieldset
@@ -84,7 +85,7 @@ const RepeatableField = ({
             >
               <RepeatableFieldContent
                 rootRef={rootRef}
-                isFocused={(focusedIndex === index) && isSomeChildElementFocused}
+                isFocused={hasToBeFocused(index)}
               >
                 {renderField(field, index, fields)}
               </RepeatableFieldContent>