diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx
index b9ff6ecd8..5f9a73fdd 100644
--- a/web/src/components/Layout.tsx
+++ b/web/src/components/Layout.tsx
@@ -108,7 +108,7 @@ const RightPanel = ({
         maxH={rigthPanelMaxH ? rigthPanelMaxH : (isSinglePanel ? "calc(100vh - 70px)" : "calc(100vh - 145px)")}
       >
         {children}
-        {!isSinglePanel && <Box display="block" minH="70px" h="90px" w="full" />}
+        {!isSinglePanel || rigthPanelScrollable && <Box display="block" minH="70px" h="90px" w="full" />}
       </VStack>
       {footer}
     </VStack>
diff --git a/web/src/components/Leaderboard.tsx b/web/src/components/Leaderboard.tsx
index 4d6f9a4c8..5829b5703 100644
--- a/web/src/components/Leaderboard.tsx
+++ b/web/src/components/Leaderboard.tsx
@@ -57,7 +57,7 @@ const Leaderboard = ({ nameEntry, ...props }: { nameEntry?: boolean } & StylePro
           boxSize="full"
           variant="dotted"
           h="auto"
-          maxH="calc(100% - 50px)"
+          maxH="calc(100% - 100px)"
           overflowY="scroll"
           __css={{
             "scrollbar-width": "none"