Fix attribute selection

2 files changed, 3 insertions, 2 deletions

diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.js
index b3608015..8bae2e59 100644
--- a/modern/src/settings/UserPage.js
+++ b/modern/src/settings/UserPage.js
@@ -345,6 +345,7 @@ const UserPage = () => {
             </AccordionDetails>
           </Accordion>
           <EditAttributesAccordion
+            attribute={attribute}
             attributes={item.attributes}
             setAttributes={(attributes) => setItem({ ...item, attributes })}
             definitions={{ ...commonUserAttributes, ...userAttributes }}
diff --git a/modern/src/settings/components/EditAttributesAccordion.js b/modern/src/settings/components/EditAttributesAccordion.js
index d159dafe..54ded187 100644
--- a/modern/src/settings/components/EditAttributesAccordion.js
+++ b/modern/src/settings/components/EditAttributesAccordion.js
@@ -39,7 +39,7 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-const EditAttributesAccordion = ({ attributes, setAttributes, definitions, focusAttribute }) => {
+const EditAttributesAccordion = ({ attribute, attributes, setAttributes, definitions, focusAttribute }) => {
   const classes = useStyles();
   const t = useTranslation();
 
@@ -160,7 +160,7 @@ const EditAttributesAccordion = ({ attributes, setAttributes, definitions, focus
   };
 
   return features.disableAttributes ? '' : (
-    <Accordion>
+    <Accordion defaultExpanded={!!attribute}>
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <Typography variant="subtitle1">
           {t('sharedAttributes')}