diff --git a/src/index.tsx b/src/index.tsx
index e8e3111c..d63b99ba 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -135,6 +135,7 @@ export function Root({
   const previousDiffFromInitial = React.useRef(0);
   const drawerRef = React.useRef<HTMLDivElement>(null);
   const drawerHeightRef = React.useRef(drawerRef.current?.getBoundingClientRect().height || 0);
+  const drawerWidthRef = React.useRef(drawerRef.current?.getBoundingClientRect().width || 0);
   const initialDrawerHeight = React.useRef(0);
 
   const onSnapPointChange = React.useCallback((activeSnapPointIndex: number) => {
@@ -187,6 +188,7 @@ export function Root({
     if (drawerRef.current && !drawerRef.current.contains(event.target as Node)) return;
 
     drawerHeightRef.current = drawerRef.current?.getBoundingClientRect().height || 0;
+    drawerWidthRef.current = drawerRef.current?.getBoundingClientRect().width || 0;
     setIsDragging(true);
     dragStartTime.current = new Date();
 
@@ -288,9 +290,11 @@ export function Root({
       // We need to capture last time when drag with scroll was triggered and have a timeout between
       const absDraggedDistance = Math.abs(draggedDistance);
       const wrapper = document.querySelector('[data-vaul-drawer-wrapper]');
+      const drawerDimension =
+        direction === 'bottom' || direction === 'top' ? drawerHeightRef.current : drawerWidthRef.current;
 
       // Calculate the percentage dragged, where 1 is the closed position
-      let percentageDragged = absDraggedDistance / drawerHeightRef.current;
+      let percentageDragged = absDraggedDistance / drawerDimension;
       const snapPointPercentageDragged = getSnapPointsPercentageDragged(absDraggedDistance, isDraggingInDirection);
 
       if (snapPointPercentageDragged !== null) {
diff --git a/test/src/app/scrollable-with-inputs/page.tsx b/test/src/app/scrollable-with-inputs/page.tsx
index 8fb331de..d29482ca 100644
--- a/test/src/app/scrollable-with-inputs/page.tsx
+++ b/test/src/app/scrollable-with-inputs/page.tsx
@@ -5,7 +5,7 @@ import { Drawer } from 'vaul';
 export default function Page() {
   return (
     <div className="w-screen h-screen bg-white p-8 flex justify-center items-center" data-vaul-drawer-wrapper="">
-      <Drawer.Root autoFocus={true}>
+      <Drawer.Root>
         <Drawer.Trigger asChild>
           <button>Open Drawer</button>
         </Drawer.Trigger>