diff --git a/code/core/src/components/components/Modal/Modal.styled.tsx b/code/core/src/components/components/Modal/Modal.styled.tsx
index f9e2fb8f7535..9ded17edd0e4 100644
--- a/code/core/src/components/components/Modal/Modal.styled.tsx
+++ b/code/core/src/components/components/Modal/Modal.styled.tsx
@@ -64,7 +64,7 @@ export const Container = styled.div<{ width?: number; height?: number }>(
 
 export const CloseButton = (props: React.ComponentProps<typeof IconButton>) => (
   <Dialog.Close asChild>
-    <IconButton {...props}>
+    <IconButton aria-label="Close" {...props}>
       <CrossIcon />
     </IconButton>
   </Dialog.Close>
diff --git a/code/core/src/manager/components/sidebar/Sidebar.tsx b/code/core/src/manager/components/sidebar/Sidebar.tsx
index 38968173e0fd..605dd84dae78 100644
--- a/code/core/src/manager/components/sidebar/Sidebar.tsx
+++ b/code/core/src/manager/components/sidebar/Sidebar.tsx
@@ -176,6 +176,7 @@ export const Sidebar = React.memo(function Sidebar({
                     tooltip={<TooltipNoteWrapper note="Create a new story" />}
                   >
                     <CreateNewStoryButton
+                      aria-label="Create a new story"
                       isMobile={isMobile}
                       onClick={() => {
                         setIsFileSearchModalOpen(true);
diff --git a/code/core/src/manager/utils/tree.ts b/code/core/src/manager/utils/tree.ts
index 15d104f214e9..49919271b43e 100644
--- a/code/core/src/manager/utils/tree.ts
+++ b/code/core/src/manager/utils/tree.ts
@@ -40,8 +40,10 @@ export const getDescendantIds = memoize(1000)((
   skipLeafs: boolean
 ): string[] => {
   const entry = data[id];
-  const children = entry.type === 'story' || entry.type === 'docs' ? [] : entry.children;
-  return children.reduce((acc, childId) => {
+  if (!entry || entry.type === 'story' || entry.type === 'docs' || !entry.children) {
+    return [];
+  }
+  return entry.children.reduce((acc, childId) => {
     const child = data[childId];
 
     if (!child || (skipLeafs && (child.type === 'story' || child.type === 'docs'))) {