diff --git a/src/hooks/useBodyScrollLock.ts b/src/hooks/useBodyScrollLock.ts
deleted file mode 100644
index b251031b2..000000000
--- a/src/hooks/useBodyScrollLock.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-
-type Options = {
-  enabled?: boolean;
-};
-
-export function useBodyScrollLock(options?: Options) {
-  const enabled = options?.enabled;
-  const scrollRef = useRef(0);
-
-  const lockScroll = useCallback(() => {
-    scrollRef.current = window.scrollY;
-    document.body.style.overflow = 'hidden';
-    document.body.style.marginTop = `-${scrollRef.current}px`;
-  }, []);
-
-  const openScroll = useCallback(() => {
-    document.body.style.removeProperty('overflow');
-    document.body.style.removeProperty('margin-top');
-    window.scrollTo(0, scrollRef.current);
-  }, []);
-
-  useEffect(() => {
-    if (enabled === undefined) {
-      return;
-    }
-
-    if (enabled) {
-      lockScroll();
-    } else {
-      openScroll();
-    }
-  }, [enabled, lockScroll, openScroll]);
-
-  return { lockScroll, openScroll };
-}
diff --git a/src/hooks/useRemoveVerticalScroll.ts b/src/hooks/useRemoveVerticalScroll.ts
new file mode 100644
index 000000000..6f0a6f128
--- /dev/null
+++ b/src/hooks/useRemoveVerticalScroll.ts
@@ -0,0 +1,66 @@
+import { useCallback, useEffect, useRef } from 'react';
+import { nonPassive } from '@/utils/eventListener';
+
+type Options = {
+  enabled?: boolean;
+};
+
+const getTouchXY = (event: TouchEvent | WheelEvent) =>
+  'changedTouches' in event
+    ? [event.changedTouches[0].clientX, event.changedTouches[0].clientY]
+    : [0, 0];
+
+const useRemoveVerticalScroll = (options?: Options) => {
+  const enabled = options?.enabled;
+
+  const touchStartRef = useRef([0, 0]);
+
+  const scrollTouchStart = useCallback((event: TouchEvent) => {
+    touchStartRef.current = getTouchXY(event);
+  }, []);
+
+  const shouldLock = useCallback((event: TouchEvent | WheelEvent) => {
+    if (!event.target) return;
+
+    const node = event.target as HTMLElement;
+    const { clientHeight, scrollHeight, scrollTop } = node;
+
+    const touch = getTouchXY(event);
+    const touchStart = touchStartRef.current;
+    const deltaY = 'deltaY' in event ? event.deltaY : touchStart[1] - touch[1];
+
+    const isDeltaYPositive = deltaY > 0; // scroll down
+
+    const isScrollToTopEnd = !isDeltaYPositive && scrollTop === 0;
+    const isScrollToBottomEnd =
+      isDeltaYPositive && scrollTop + clientHeight === scrollHeight;
+
+    if (
+      node.tagName !== 'TEXTAREA' ||
+      isScrollToTopEnd ||
+      isScrollToBottomEnd
+    ) {
+      if (event.cancelable) {
+        event.preventDefault();
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!enabled) {
+      return;
+    }
+
+    document.addEventListener('wheel', shouldLock, nonPassive);
+    document.addEventListener('touchmove', shouldLock, nonPassive);
+    document.addEventListener('touchstart', scrollTouchStart, nonPassive);
+
+    return () => {
+      document.removeEventListener('wheel', shouldLock, nonPassive);
+      document.removeEventListener('touchmove', shouldLock, nonPassive);
+      document.removeEventListener('touchstart', scrollTouchStart, nonPassive);
+    };
+  }, [enabled, shouldLock, scrollTouchStart]);
+};
+
+export default useRemoveVerticalScroll;
diff --git a/src/styles/global.css b/src/styles/global.css
index a98c4987e..86b73f2f6 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -29,7 +29,7 @@
   .app-layout {
     /* TODO: Chakra UI 걷어내면 제거 */
     max-width: 43rem;
-    margin: 0 auto !important;
+    margin: 0 auto;
   }
 
   /* DatePicker Calendar 스타일링 */
diff --git a/src/utils/eventListener.ts b/src/utils/eventListener.ts
new file mode 100644
index 000000000..18731f98e
--- /dev/null
+++ b/src/utils/eventListener.ts
@@ -0,0 +1,32 @@
+/**
+ * 참고
+ * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#safely_detecting_option_support
+ * */
+
+type FixedEventListenerOptions =
+  | (AddEventListenerOptions & EventListenerOptions)
+  | boolean;
+
+let passiveSupported = false;
+
+const emptyListener = () => void {};
+
+try {
+  const options: FixedEventListenerOptions = {
+    get passive() {
+      // This function will be called when the browser
+      // attempts to access the passive property.
+      passiveSupported = true;
+      return false;
+    },
+  };
+
+  window.addEventListener('test', emptyListener, options);
+  window.removeEventListener('test', emptyListener, options);
+} catch {
+  passiveSupported = false;
+}
+
+export const nonPassive: FixedEventListenerOptions = passiveSupported
+  ? { passive: false }
+  : false;
diff --git a/src/v1/base/Drawer.tsx b/src/v1/base/Drawer.tsx
index 8daf4ff89..d5fb2d9e7 100644
--- a/src/v1/base/Drawer.tsx
+++ b/src/v1/base/Drawer.tsx
@@ -1,13 +1,20 @@
-import { createContext, PropsWithChildren, ReactNode, useContext } from 'react';
+import {
+  createContext,
+  Fragment,
+  PropsWithChildren,
+  ReactNode,
+  useContext,
+} from 'react';
+import { Dialog, Transition } from '@headlessui/react';
 
 import { IconClose } from '@public/icons';
-import { useBodyScrollLock } from '@/hooks/useBodyScrollLock';
+import useRemoveVerticalScroll from '@/hooks/useRemoveVerticalScroll';
 
-import Portal from '@/v1/base/Portal';
+import Button from './Button';
 
 interface DrawerProps {
   isOpen: boolean;
-  onClose?: () => void;
+  onClose: () => void;
 }
 
 type DrawerContextValue = DrawerProps;
@@ -20,44 +27,66 @@ const Drawer = ({
   onClose,
   children,
 }: PropsWithChildren<DrawerProps>) => {
-  useBodyScrollLock({ enabled: isOpen });
+  useRemoveVerticalScroll({ enabled: isOpen });
 
   return (
     <DrawerContext.Provider value={{ isOpen, onClose }}>
-      <Portal id="drawer-root">
-        <div
-          className={`fixed inset-0 z-10 flex w-screen transform justify-center overflow-hidden ease-in-out ${
-            isOpen
-              ? 'translate-x-0 scale-x-100 opacity-100 transition-opacity duration-500'
-              : 'translate-x-full scale-x-0 opacity-0 transition-all delay-100 duration-500'
-          }`}
-        >
+      <Transition.Root show={isOpen} as={Fragment}>
+        <Dialog className="relative z-10" onClose={onClose}>
           {/** overlay */}
-          <div className="absolute h-full w-full" onClick={onClose} />
-          {/** drawer section */}
-          <section
-            className={`duration-400 ease-out-in relative flex h-full w-full max-w-[43rem] transform flex-col gap-[2rem] overflow-hidden bg-white p-[2rem] shadow-bookcard transition-all ${
-              isOpen ? 'translate-x-0' : 'translate-x-full'
-            }`}
+          <Transition.Child
+            as={Fragment}
+            enter="ease-in-out duration-500"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in-out duration-500"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
           >
-            {isOpen && children}
-          </section>
-        </div>
-      </Portal>
+            <div className=" fixed inset-0 bg-black-900/50 transition-opacity" />
+          </Transition.Child>
+
+          <div className="fixed inset-0 overflow-hidden">
+            <div className="absolute inset-0 overflow-hidden">
+              <div
+                className={`pointer-events-none fixed inset-y-0 right-0 flex w-full max-w-full justify-center`}
+              >
+                <Transition.Child
+                  as={Fragment}
+                  enter="transform transition ease-in-out duration-500 sm:duration-600"
+                  enterFrom="translate-x-full opacity-0"
+                  enterTo="translate-x-0 opacity-1"
+                  leave="transform transition ease-in-out duration-500 sm:duration-600"
+                  leaveFrom="translate-x-0 opacity-1"
+                  leaveTo="translate-x-full opacity-0"
+                >
+                  <Dialog.Panel className="pointer-events-auto relative w-screen max-w-[43rem]">
+                    <div
+                      className={`flex h-full flex-col overflow-y-scroll bg-white pt-6 shadow-xl`}
+                    >
+                      {children}
+                    </div>
+                  </Dialog.Panel>
+                </Transition.Child>
+              </div>
+            </div>
+          </div>
+        </Dialog>
+      </Transition.Root>
     </DrawerContext.Provider>
   );
 };
 
 const DrawerHeader = ({ children }: { children?: ReactNode }) => {
   return (
-    <div className="flex items-center justify-between py-[0.5rem]">
+    <div className="flex items-center justify-between px-6 py-[0.5rem] sm:px-8">
       {children}
     </div>
   );
 };
 
 const DrawerContent = ({ children }: { children?: ReactNode }) => {
-  return <div className="w-full text-md">{children}</div>;
+  return <div className="w-full px-6 pt-6 text-md sm:px-8">{children}</div>;
 };
 
 const Title = ({ text }: { text?: string }) => {
@@ -73,10 +102,10 @@ type Position = 'top-left' | 'top-right';
 const getPositionClasses = (postion: Position) => {
   switch (postion) {
     case 'top-right':
-      return 'top-[2.7rem] right-[2rem]';
+      return 'top-[2.4rem] right-[1.8rem]';
     case 'top-left':
     default:
-      return 'top-[2.7rem] left-[2rem]';
+      return 'top-[2.4rem] left-[1.8rem]';
   }
 };
 
@@ -85,10 +114,13 @@ const CloseButton = ({ position = 'top-left' }: { position?: Position }) => {
   const positionClasses = getPositionClasses(position);
 
   return (
-    <IconClose
-      className={`absolute h-[2rem] w-[2rem] cursor-pointer fill-black-900 ${positionClasses}`}
+    <Button
       onClick={onClose}
-    />
+      fill={false}
+      className={`absolute border-none !p-0 ${positionClasses}`}
+    >
+      <IconClose className={`h-[2rem] w-[2rem] fill-black-900 `} />
+    </Button>
   );
 };
 
diff --git a/src/v1/comment/CommentDrawer.tsx b/src/v1/comment/CommentDrawer.tsx
index c47edea7b..4ea697968 100644
--- a/src/v1/comment/CommentDrawer.tsx
+++ b/src/v1/comment/CommentDrawer.tsx
@@ -1,4 +1,6 @@
-import { forwardRef } from 'react';
+'use client';
+
+import { forwardRef, useEffect } from 'react';
 
 import Button from '@/v1/base/Button';
 import Drawer from '@/v1/base/Drawer';
@@ -19,6 +21,21 @@ const CommentDrawer = forwardRef<HTMLTextAreaElement, CommentDrawerProps>(
       onClose();
     };
 
+    useEffect(() => {
+      if (!isOpen) return;
+
+      // Drawer가 열릴 때 textarea의 끝에 focus
+      setTimeout(() => {
+        const textarea = document.querySelector('textarea');
+
+        if (textarea) {
+          textarea.focus();
+          textarea.select();
+          window.getSelection()?.collapseToEnd();
+        }
+      }, 100);
+    }, [isOpen]);
+
     return (
       <Drawer isOpen={isOpen} onClose={onClose}>
         <Drawer.Header>
@@ -36,7 +53,7 @@ const CommentDrawer = forwardRef<HTMLTextAreaElement, CommentDrawerProps>(
         </Drawer.Header>
         <Drawer.Content>
           <textarea
-            className="h-full w-full resize-none border-none text-md focus:outline-none"
+            className="w-full resize-none border-none text-md focus:outline-none"
             rows={15}
             defaultValue={defaultComment}
             placeholder={placeholder}