diff --git a/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/Toolbar/TidyUpButton/TidyUpButton.tsx b/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/Toolbar/TidyUpButton/TidyUpButton.tsx
index 7b76cf629..f60179dc1 100644
--- a/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/Toolbar/TidyUpButton/TidyUpButton.tsx
+++ b/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/Toolbar/TidyUpButton/TidyUpButton.tsx
@@ -1,17 +1,20 @@
 import { IconButton, TidyUpIcon } from '@liam-hq/ui'
 import { ToolbarButton } from '@radix-ui/react-toolbar'
-import type { FC } from 'react'
+import { type FC, useCallback } from 'react'
 import { useAutoLayout } from '../../useAutoLayout'
 
 export const TidyUpButton: FC = () => {
   const { handleLayout } = useAutoLayout()
+  const handleClick = useCallback(() => {
+    handleLayout()
+  }, [handleLayout])
 
   return (
     <ToolbarButton asChild>
       <IconButton
         icon={<TidyUpIcon />}
         tooltipContent="Tidy up"
-        onClick={handleLayout}
+        onClick={handleClick}
       />
     </ToolbarButton>
   )