diff --git a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
index bd03dba..bc9973f 100644
--- a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
+++ b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
@@ -1,5 +1,5 @@
 import React, { ReactNode } from "react";
-import { Box, Stack } from "@mantine/core";
+import { Box, ScrollArea, Stack } from "@mantine/core";
 import { StatusSchema } from "@/lib/client";
 import styles from "./StatusColumnWrapper.module.css";
 
@@ -17,7 +17,11 @@ const StatusColumnWrapper = ({ renderHeader, children }: Props) => {
                 pb={"xs"}
                 className={styles["inner-container"]}>
                 {renderHeader()}
-                {children}
+                <ScrollArea
+                    offsetScrollbars={"y"}
+                    scrollbars={"y"}>
+                    <Stack mah={"calc(100vh - 220px)"}>{children}</Stack>
+                </ScrollArea>
             </Stack>
         </Box>
     );
diff --git a/src/components/dnd/FunnelDnd/FunnelDnd.tsx b/src/components/dnd/FunnelDnd/FunnelDnd.tsx
index ed53b6f..b6560ee 100644
--- a/src/components/dnd/FunnelDnd/FunnelDnd.tsx
+++ b/src/components/dnd/FunnelDnd/FunnelDnd.tsx
@@ -134,6 +134,7 @@ const FunnelDnd = <
                 mousewheel={{
                     enabled: true,
                     sensitivity: 0.2,
+                    releaseOnEdges: true,
                 }}
                 freeMode={{ enabled: true }}
                 grabCursor>