diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx
index d03ff4f95..bcd169bac 100644
--- a/src/frontend/src/components/headerComponent/index.tsx
+++ b/src/frontend/src/components/headerComponent/index.tsx
@@ -134,7 +134,7 @@ export default function Header(): JSX.Element {
           </Link>
         )}
       </div>
-      <div className="header-end-division lg:w-[407px]">
+      <div className="header-end-division">
         <div className="header-end-display">
           <a
             href="https://github.com/langflow-ai/langflow"
diff --git a/src/frontend/src/components/sidebarComponent/index.tsx b/src/frontend/src/components/sidebarComponent/index.tsx
index 8cdbe5907..dbf80c771 100644
--- a/src/frontend/src/components/sidebarComponent/index.tsx
+++ b/src/frontend/src/components/sidebarComponent/index.tsx
@@ -34,22 +34,22 @@ export default function SidebarNav({
   const pathValues = ["folder", "components", "flows", "all"];
   const isFolderPath = pathValues.some((value) => pathname.includes(value));
 
+  // Ensure all conditions are covered and provide a default case if necessary
+  const sidebarContent =
+    items.length > 0 ? (
+      <SideBarButtonsComponent items={items} pathname={pathname} />
+    ) : !loadingFolders && folders?.length > 0 && isFolderPath ? (
+      <SideBarFoldersButtonsComponent
+        pathname={pathname}
+        handleChangeFolder={handleChangeFolder}
+        handleDeleteFolder={handleDeleteFolder}
+      />
+    ) : null;
+
   return (
     <nav className={cn(className)} {...props}>
       <HorizontalScrollFadeComponent>
-        {items.length > 0 ? (
-          <SideBarButtonsComponent items={items} pathname={pathname} />
-        ) : (
-          !loadingFolders &&
-          folders?.length > 0 &&
-          isFolderPath && (
-            <SideBarFoldersButtonsComponent
-              pathname={pathname}
-              handleChangeFolder={handleChangeFolder}
-              handleDeleteFolder={handleDeleteFolder}
-            />
-          )
-        )}
+        {sidebarContent!}
       </HorizontalScrollFadeComponent>
     </nav>
   );