diff --git a/functions/package.json b/functions/package.json
index 5839b5eb..d6278c25 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -39,6 +39,7 @@
     "lodash": "4.17.21",
     "mailgun-js": "0.22.0",
     "module-alias": "2.2.2",
+    "react-masonry-css": "1.0.16",
     "stripe": "8.194.0",
     "zod": "3.17.2"
   },
diff --git a/web/components/contract/contracts-grid.tsx b/web/components/contract/contracts-grid.tsx
index bf0cd9b8..70abc1dc 100644
--- a/web/components/contract/contracts-grid.tsx
+++ b/web/components/contract/contracts-grid.tsx
@@ -9,6 +9,7 @@ import { useCallback } from 'react'
 import clsx from 'clsx'
 import { LoadingIndicator } from '../loading-indicator'
 import { VisibilityObserver } from '../visibility-observer'
+import Masonry from 'react-masonry-css'
 
 export type ContractHighlightOptions = {
   contractIds?: string[]
@@ -61,50 +62,14 @@ export function ContractsGrid(props: {
       </p>
     )
   }
-  // Reorganize the contracts so that the masonry layout shows them in the original order
-  // E.g. from [0, 1, 2, 3] => [0, 2, 1, 3]
-  // E.g. from [0, 1, 2, 3, 4, 5, 6] => [0, 2, 4, 1, 3, 5, 6]
-  const halfway = Math.floor(contracts.length / 2)
-  function reorder(i: number) {
-    return i < halfway
-      ? i * 2
-      : Math.min((i - halfway) * 2 + 1, (contracts?.length ?? 1) - 1)
-  }
-  const twoColContracts = Array.from(
-    { length: contracts.length },
-    (_, i) => contracts[reorder(i)]
-  )
 
   return (
     <Col className="gap-8">
-      <div
-        className={clsx(
-          'hidden w-full gap-4 space-y-4 md:block md:columns-2',
-          gridClassName
-        )}
-      >
-        {twoColContracts.map((contract) => (
-          <ContractCard
-            contract={contract}
-            key={contract.id}
-            showTime={showTime}
-            onClick={
-              onContractClick ? () => onContractClick(contract) : undefined
-            }
-            hideQuickBet={hideQuickBet}
-            hideGroupLink={hideGroupLink}
-            className={clsx(
-              'break-inside-avoid-column',
-              contractIds?.includes(contract.id) && highlightClassName
-            )}
-          />
-        ))}
-      </div>
-      <div
-        className={clsx(
-          'w-full columns-1 gap-4 space-y-4 md:hidden',
-          gridClassName
-        )}
+      <Masonry
+        // Show only 1 column on tailwind md = 768px
+        breakpointCols={{ default: 2, 768: 1 }}
+        className="-ml-4 flex w-auto"
+        columnClassName="pl-4 bg-clip-padding"
       >
         {contracts.map((contract) => (
           <ContractCard
@@ -117,12 +82,12 @@ export function ContractsGrid(props: {
             hideQuickBet={hideQuickBet}
             hideGroupLink={hideGroupLink}
             className={clsx(
-              'break-inside-avoid-column',
+              'mb-4 break-inside-avoid-column',
               contractIds?.includes(contract.id) && highlightClassName
             )}
           />
         ))}
-      </div>
+      </Masonry>
       <VisibilityObserver
         onVisibilityUpdated={onVisibilityUpdated}
         className="relative -top-96 h-1"
diff --git a/yarn.lock b/yarn.lock
index b28b373b..bbc13091 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9947,6 +9947,11 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1:
   dependencies:
     "@babel/runtime" "^7.10.3"
 
+react-masonry-css@1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/react-masonry-css/-/react-masonry-css-1.0.16.tgz#72b28b4ae3484e250534700860597553a10f1a2c"
+  integrity sha512-KSW0hR2VQmltt/qAa3eXOctQDyOu7+ZBevtKgpNDSzT7k5LA/0XntNa9z9HKCdz3QlxmJHglTZ18e4sX4V8zZQ==
+
 react-motion@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"