diff --git a/src/common/components/PageLayout.jsx b/src/common/components/PageLayout.jsx
index e81c975402..34a0dd3273 100644
--- a/src/common/components/PageLayout.jsx
+++ b/src/common/components/PageLayout.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
import {
AppBar,
Breadcrumbs,
@@ -74,6 +74,8 @@ const PageLayout = ({ menu, breadcrumbs, children }) => {
const [openDrawer, setOpenDrawer] = useState(false);
+ const menuMemo = useMemo(() => menu, []);
+
return desktop ? (
{
- {menu}
+ {menuMemo}
{children}
@@ -100,7 +102,7 @@ const PageLayout = ({ menu, breadcrumbs, children }) => {
onClose={() => setOpenDrawer(false)}
classes={{ paper: classes.mobileDrawer }}
>
- {menu}
+ {menuMemo}
diff --git a/src/settings/components/EditItemView.jsx b/src/settings/components/EditItemView.jsx
index 61bc41616e..9aae17859b 100644
--- a/src/settings/components/EditItemView.jsx
+++ b/src/settings/components/EditItemView.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import {
Container, Button, Accordion, AccordionDetails, AccordionSummary, Skeleton, Typography, TextField,
@@ -54,8 +54,10 @@ const EditItemView = ({
}
});
+ const menuMemo = useMemo(() => menu, []);
+
return (
-
+
{item ? children : (