diff --git a/src/components/files/FileCard.tsx b/src/components/files/FileCard.tsx
index 0c4967be..bee7414a 100644
--- a/src/components/files/FileCard.tsx
+++ b/src/components/files/FileCard.tsx
@@ -94,15 +94,16 @@ function FileCard({
 
       {selectedGame && (
         <>
-          <GameSelector
-            height={150}
-            setGames={setGames}
-            games={games}
-            activePage={page}
-            path={selected.path}
-            setPage={setPage}
-            total={selected.numGames}
-          />
+          <Box h="50%">
+            <GameSelector
+              setGames={setGames}
+              games={games}
+              activePage={page}
+              path={selected.path}
+              setPage={setPage}
+              total={selected.numGames}
+            />
+          </Box>
           <GamePreview pgn={selectedGame} />
         </>
       )}
diff --git a/src/components/panels/analysis/AnalysisPanel.tsx b/src/components/panels/analysis/AnalysisPanel.tsx
index 15dfa932..15926e84 100644
--- a/src/components/panels/analysis/AnalysisPanel.tsx
+++ b/src/components/panels/analysis/AnalysisPanel.tsx
@@ -229,9 +229,7 @@ function AnalysisPanel({
             flexDirection: "column",
           }}
         >
-          <Stack>
-            <LogsPanel />
-          </Stack>
+          <LogsPanel />
         </Tabs.Panel>
       </Tabs>
     </Stack>
diff --git a/src/components/panels/analysis/LogsPanel.tsx b/src/components/panels/analysis/LogsPanel.tsx
index 8f28ffb6..1f3d4749 100644
--- a/src/components/panels/analysis/LogsPanel.tsx
+++ b/src/components/panels/analysis/LogsPanel.tsx
@@ -7,12 +7,15 @@ import {
   ActionIcon,
   Table,
   Select,
+  Box,
+  Stack,
 } from "@mantine/core";
 import { IconFileExport, IconRefresh } from "@tabler/icons-react";
 import { useAtomValue } from "jotai";
 import { forwardRef, useEffect, useMemo, useRef, useState } from "react";
 import useSWR from "swr";
 import { FixedSizeList } from "react-window";
+import AutoSizer from "react-virtualized-auto-sizer";
 import { commands } from "@/bindings";
 import { LocalEngine } from "@/utils/engines";
 import { save } from "@tauri-apps/api/dialog";
@@ -69,7 +72,7 @@ export default function LogsPanel() {
   }
 
   return (
-    <>
+    <Stack style={{ flex: 1 }} h="100%">
       <Group grow>
         <ActionIcon.Group style={{ flexGrow: 0 }}>
           <ActionIcon size="lg" variant="default" onClick={() => mutate()}>
@@ -105,20 +108,26 @@ export default function LogsPanel() {
           No logs for {engine?.name ?? "engine"}
         </Text>
       )}
-      <FixedSizeList
-        itemCount={filteredData?.length || 0}
-        itemSize={30}
-        height={200}
-        width="100%"
-        innerElementType={Inner}
-      >
-        {({ index, style }) => (
-          <Table.Tr style={style}>
-            <LogLine log={filteredData![index]} />
-          </Table.Tr>
-        )}
-      </FixedSizeList>
-    </>
+      <Box w="100%" style={{ flex: 1 }}>
+        <AutoSizer>
+          {({ height, width }) => (
+            <FixedSizeList
+              itemCount={filteredData?.length || 0}
+              itemSize={30}
+              height={height}
+              width={width}
+              innerElementType={Inner}
+            >
+              {({ index, style }) => (
+                <Table.Tr style={style}>
+                  <LogLine log={filteredData![index]} />
+                </Table.Tr>
+              )}
+            </FixedSizeList>
+          )}
+        </AutoSizer>
+      </Box>
+    </Stack>
   );
 }
 
diff --git a/src/components/panels/info/FenSearch.tsx b/src/components/panels/info/FenSearch.tsx
index 1980bf77..ff2f4be2 100644
--- a/src/components/panels/info/FenSearch.tsx
+++ b/src/components/panels/info/FenSearch.tsx
@@ -58,7 +58,7 @@ export default function FenSearch({ currentFen }: { currentFen: string }) {
   const exactOptionMatch = data?.some((item) => item.fen === search);
 
   const options = data?.map((item) => (
-    <Combobox.Option value={item.fen} key={item.fen}>
+    <Combobox.Option value={item.fen} key={item.name}>
       <Group wrap="nowrap">
         <div>
           <Text size="sm">{item.name}</Text>
diff --git a/src/components/panels/info/GameSelector.tsx b/src/components/panels/info/GameSelector.tsx
index 63f6408f..93c460f2 100644
--- a/src/components/panels/info/GameSelector.tsx
+++ b/src/components/panels/info/GameSelector.tsx
@@ -16,7 +16,6 @@ import cx from "clsx";
 import * as classes from "./GameSelector.css"
 
 export default function GameSelector({
-  height,
   games,
   setGames,
   setPage,
@@ -25,7 +24,6 @@ export default function GameSelector({
   activePage,
   deleteGame,
 }: {
-  height: number;
   games: Map<number, string>;
   setGames: React.Dispatch<React.SetStateAction<Map<number, string>>>;
   setPage: (v: number) => void;
@@ -58,8 +56,8 @@ export default function GameSelector({
   }, [games.size, loadMoreRows]);
 
   return (
-    <AutoSizer disableHeight>
-      {({ width }) => (
+    <AutoSizer>
+      {({ width, height }) => (
         <InfiniteLoader
           loadMoreItems={loadMoreRows}
           itemCount={total}
diff --git a/src/components/panels/info/InfoPanel.tsx b/src/components/panels/info/InfoPanel.tsx
index 93160280..4b37daf0 100644
--- a/src/components/panels/info/InfoPanel.tsx
+++ b/src/components/panels/info/InfoPanel.tsx
@@ -1,4 +1,4 @@
-import { Accordion, ScrollArea, Stack, Text, Group } from "@mantine/core";
+import { Accordion, ScrollArea, Stack, Text, Group, Box } from "@mantine/core";
 import { useContext, useMemo, useState } from "react";
 import { getNodeAtPath } from "@/utils/treeReducer";
 import GameInfo from "@/components/common/GameInfo";
@@ -141,17 +141,18 @@ function GameSelectorAccordion({
           <Accordion.Control>
             {formatNumber(gameNumber + 1)}. {currentName}
           </Accordion.Control>
-          <Accordion.Panel h={200} mb={20}>
-            <GameSelector
-              height={200}
-              games={games}
-              setGames={setGames}
-              setPage={setPage}
-              deleteGame={deleteGame}
-              path={currentTab.file.path}
-              activePage={gameNumber || 0}
-              total={currentTab.file.numGames}
-            />
+          <Accordion.Panel>
+            <Box h="10rem">
+              <GameSelector
+                games={games}
+                setGames={setGames}
+                setPage={setPage}
+                deleteGame={deleteGame}
+                path={currentTab.file.path}
+                activePage={gameNumber || 0}
+                total={currentTab.file.numGames}
+              />
+            </Box>
           </Accordion.Panel>
         </Accordion.Item>
       </Accordion>