diff --git a/frontend/src/app/workspace/chats/[thread_id]/page.tsx b/frontend/src/app/workspace/chats/[thread_id]/page.tsx
index c87b55c2..b3df477e 100644
--- a/frontend/src/app/workspace/chats/[thread_id]/page.tsx
+++ b/frontend/src/app/workspace/chats/[thread_id]/page.tsx
@@ -452,9 +452,9 @@ export default function ChatPage() {
                           {t.common.artifacts}
                         </h2>
                       </header>
-                      <main className="min-h-0 grow">
+                      <main className="min-h-0 grow overflow-auto">
                         <ArtifactFileList
-                          className="max-w-(--container-width-sm) p-4 pt-12"
+                          className="max-w-(--container-width-sm) p-4 pt-12 mb-[207px]"
                           files={thread.values.artifacts ?? []}
                           threadId={threadId}
                         />
diff --git a/frontend/src/components/workspace/artifacts/context.tsx b/frontend/src/components/workspace/artifacts/context.tsx
index b2e67a76..3f99282b 100644
--- a/frontend/src/components/workspace/artifacts/context.tsx
+++ b/frontend/src/components/workspace/artifacts/context.tsx
@@ -37,11 +37,12 @@ interface ArtifactsProviderProps {
 export function ArtifactsProvider({ children }: ArtifactsProviderProps) {
   const [artifacts, setArtifacts] = useState<string[]>([]);
   const [selectedArtifact, setSelectedArtifact] = useState<string | null>(null);
-  const [autoSelect, setAutoSelect] = useState(true);
-  const [open, setOpen] = useState(
-    env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY === "true",
-  );
-  const [autoOpen, setAutoOpen] = useState(true);
+  const [autoSelect, setAutoSelect] = useState(false);
+  const [open, setOpen] = useState(false);
+  //   const [open, setOpen] = useState(
+  //   env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY === "true",
+  // );
+  const [autoOpen, setAutoOpen] = useState(false);
   const [fullscreen, setFullscreen] = useState(false);
   const { setOpen: setSidebarOpen } = useSidebar();