diff --git a/frontend/src/components/ui/shadcn-io/kanban/index.tsx b/frontend/src/components/ui/shadcn-io/kanban/index.tsx
index 663603f2..425e7047 100644
--- a/frontend/src/components/ui/shadcn-io/kanban/index.tsx
+++ b/frontend/src/components/ui/shadcn-io/kanban/index.tsx
@@ -2,7 +2,7 @@
 
 import { Card } from '@/components/ui/card';
 import { cn } from '@/lib/utils';
-import type { DragEndEvent } from '@dnd-kit/core';
+import type { DragEndEvent, Modifier } from '@dnd-kit/core';
 import {
   DndContext,
   PointerSensor,
@@ -12,9 +12,10 @@ import {
   useSensor,
   useSensors,
 } from '@dnd-kit/core';
-import { restrictToFirstScrollableAncestor } from '@dnd-kit/modifiers';
-import type { ReactNode, Ref, KeyboardEvent } from 'react';
+import { type ReactNode, type Ref, type KeyboardEvent } from 'react';
 
+import type { ClientRect } from '@dnd-kit/core';
+import type { Transform } from '@dnd-kit/utilities';
 export type { DragEndEvent } from '@dnd-kit/core';
 
 export type Status = {
@@ -163,6 +164,66 @@ export const KanbanHeader = (props: KanbanHeaderProps) =>
     </Card>
   );
 
+function restrictToBoundingRectWithRightPadding(
+  transform: Transform,
+  rect: ClientRect,
+  boundingRect: ClientRect,
+  rightPadding: number
+): Transform {
+  console.log(rect, boundingRect);
+  const value = {
+    ...transform,
+  };
+
+  if (rect.top + transform.y <= boundingRect.top) {
+    value.y = boundingRect.top - rect.top;
+  } else if (
+    rect.bottom + transform.y >=
+    boundingRect.top + boundingRect.height
+  ) {
+    value.y = boundingRect.top + boundingRect.height - rect.bottom;
+  }
+
+  if (rect.left + transform.x <= boundingRect.left) {
+    value.x = boundingRect.left - rect.left;
+  } else if (
+    // branch that checks if the right edge of the dragged element is beyond
+    // the right edge of the bounding rectangle
+    rect.right + transform.x + rightPadding >=
+    boundingRect.left + boundingRect.width
+  ) {
+    value.x =
+      boundingRect.left + boundingRect.width - rect.right - rightPadding;
+  }
+
+  return {
+    ...value,
+    x: value.x,
+  };
+}
+
+// An alternative to `restrictToFirstScrollableAncestor` from the dnd-kit library
+const restrictToFirstScrollableAncestorCustom: Modifier = (args) => {
+  const { draggingNodeRect, transform, scrollableAncestorRects } = args;
+  const firstScrollableAncestorRect = scrollableAncestorRects[0];
+
+  if (!draggingNodeRect || !firstScrollableAncestorRect) {
+    return transform;
+  }
+
+  // Inset the right edge that the rect can be dragged to by this amount.
+  // This is a workaround for the kanban board where dragging a card too far
+  // to the right causes infinite horizontal scrolling if there are also
+  // enough cards for vertical scrolling to be enabled.
+  const rightPadding = 16;
+  return restrictToBoundingRectWithRightPadding(
+    transform,
+    draggingNodeRect,
+    firstScrollableAncestorRect,
+    rightPadding
+  );
+};
+
 export type KanbanProviderProps = {
   children: ReactNode;
   onDragEnd: (event: DragEndEvent) => void;
@@ -185,7 +246,7 @@ export const KanbanProvider = ({
       collisionDetection={rectIntersection}
       onDragEnd={onDragEnd}
       sensors={sensors}
-      modifiers={[restrictToFirstScrollableAncestor]}
+      modifiers={[restrictToFirstScrollableAncestorCustom]}
     >
       <div
         className={cn(
diff --git a/frontend/src/pages/project-tasks.tsx b/frontend/src/pages/project-tasks.tsx
index b6f24ab5..e6e335df 100644
--- a/frontend/src/pages/project-tasks.tsx
+++ b/frontend/src/pages/project-tasks.tsx
@@ -521,7 +521,7 @@ export function ProjectTasks() {
               </Card>
             </div>
           ) : (
-            <div className="w-full h-full overflow-x-auto">
+            <div className="w-full h-full">
               <TaskKanbanBoard
                 groupedTasks={groupedFilteredTasks}
                 onDragEnd={handleDragEnd}
diff --git a/package.json b/package.json
index c7945989..dc844ea6 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
     "pnpm": ">=8"
   },
   "dependencies": {
-    "@ebay/nice-modal-react": "^1.2.13",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@ebay/nice-modal-react": "^1.2.13"
   }
 }