diff --git a/src/DrawerPanel.tsx b/src/DrawerPanel.tsx
index 619e4146..5be8c950 100644
--- a/src/DrawerPanel.tsx
+++ b/src/DrawerPanel.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import type { Placement } from './Drawer';
-import KeyCode from 'rc-util/lib/KeyCode';
-import { composeRef } from 'rc-util/lib/ref';
 
 export interface DrawerPanelRef {
   focus: VoidFunction;
@@ -16,121 +14,48 @@ export interface DrawerPanelProps {
   height?: number | string;
   placement: Placement;
   children?: React.ReactNode;
-  onClose?: React.KeyboardEventHandler<HTMLElement>;
   containerRef?: React.Ref<HTMLDivElement>;
 }
 
-const sentinelStyle: React.CSSProperties = {
-  width: 0,
-  height: 0,
-  overflow: 'hidden',
-  outline: 'none',
-  position: 'absolute',
+const DrawerPanel = (props: DrawerPanelProps) => {
+  const {
+    prefixCls,
+    className,
+    style,
+    placement,
+    width,
+    height,
+    children,
+    containerRef,
+  } = props;
+
+  // =============================== Render ===============================
+  const panelStyle: React.CSSProperties = {};
+
+  if (placement === 'left' || placement === 'right') {
+    panelStyle.width = width;
+  } else {
+    panelStyle.height = height;
+  }
+
+  return (
+    <>
+      <div
+        className={classNames(`${prefixCls}-content`, className)}
+        style={{
+          ...panelStyle,
+          ...style,
+        }}
+        aria-modal="true"
+        role="dialog"
+        ref={containerRef}
+      >
+        {children}
+      </div>
+    </>
+  );
 };
 
-const DrawerPanel = React.forwardRef<DrawerPanelRef, DrawerPanelProps>(
-  (props, ref) => {
-    const {
-      prefixCls,
-      className,
-      style,
-      placement,
-      width,
-      height,
-      children,
-      onClose,
-      containerRef,
-    } = props;
-
-    // ================================ Refs ================================
-    const panelRef = React.useRef<HTMLDivElement>();
-    const sentinelStartRef = React.useRef<HTMLDivElement>();
-    const sentinelEndRef = React.useRef<HTMLDivElement>();
-
-    React.useImperativeHandle(ref, () => ({
-      focus: () => {
-        Promise.resolve().then(() => {
-          sentinelStartRef.current?.focus({ preventScroll: true });
-        });
-      },
-    }));
-
-    const onPanelKeyDown: React.KeyboardEventHandler<
-      HTMLDivElement
-    > = event => {
-      const { keyCode, shiftKey } = event;
-
-      switch (keyCode) {
-        // Tab active
-        case KeyCode.TAB: {
-          if (keyCode === KeyCode.TAB) {
-            if (
-              !shiftKey &&
-              document.activeElement === sentinelEndRef.current
-            ) {
-              sentinelStartRef.current?.focus({ preventScroll: true });
-            } else if (
-              shiftKey &&
-              document.activeElement === sentinelStartRef.current
-            ) {
-              sentinelEndRef.current?.focus({ preventScroll: true });
-            }
-          }
-          break;
-        }
-
-        // Close
-        case KeyCode.ESC: {
-          onClose(event);
-          break;
-        }
-      }
-    };
-
-    // =============================== Render ===============================
-    const panelStyle: React.CSSProperties = {};
-
-    if (placement === 'left' || placement === 'right') {
-      panelStyle.width = width;
-    } else {
-      panelStyle.height = height;
-    }
-
-    return (
-      <>
-        <div
-          className={classNames(`${prefixCls}-content`, className)}
-          style={{
-            ...panelStyle,
-            ...style,
-          }}
-          aria-modal="true"
-          role="dialog"
-          tabIndex={-1}
-          ref={composeRef(panelRef, containerRef)}
-          onKeyDown={onPanelKeyDown}
-        >
-          <div
-            tabIndex={0}
-            ref={sentinelStartRef}
-            style={sentinelStyle}
-            aria-hidden="true"
-          />
-
-          {children}
-
-          <div
-            tabIndex={0}
-            ref={sentinelEndRef}
-            style={sentinelStyle}
-            aria-hidden="true"
-          />
-        </div>
-      </>
-    );
-  },
-);
-
 if (process.env.NODE_ENV !== 'production') {
   DrawerPanel.displayName = 'DrawerPanel';
 }
diff --git a/src/DrawerPopup.tsx b/src/DrawerPopup.tsx
index 1aaa4bec..117705c7 100644
--- a/src/DrawerPopup.tsx
+++ b/src/DrawerPopup.tsx
@@ -2,11 +2,19 @@ import * as React from 'react';
 import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
 import type { CSSMotionProps } from 'rc-motion';
-import type { DrawerPanelRef } from './DrawerPanel';
 import DrawerPanel from './DrawerPanel';
 import type ScrollLocker from 'rc-util/lib/Dom/scrollLocker';
 import DrawerContext from './context';
 import type { DrawerContextProps } from './context';
+import KeyCode from 'rc-util/lib/KeyCode';
+
+const sentinelStyle: React.CSSProperties = {
+  width: 0,
+  height: 0,
+  overflow: 'hidden',
+  outline: 'none',
+  position: 'absolute',
+};
 
 export type Placement = 'left' | 'right' | 'top' | 'bottom';
 
@@ -97,6 +105,48 @@ export default function DrawerPopup(props: DrawerPopupProps) {
     onClose,
   } = props;
 
+  // ================================ Refs ================================
+  const panelRef = React.useRef<HTMLDivElement>();
+  const sentinelStartRef = React.useRef<HTMLDivElement>();
+  const sentinelEndRef = React.useRef<HTMLDivElement>();
+
+  const onPanelKeyDown: React.KeyboardEventHandler<HTMLDivElement> = event => {
+    const { keyCode, shiftKey } = event;
+
+    switch (keyCode) {
+      // Tab active
+      case KeyCode.TAB: {
+        if (keyCode === KeyCode.TAB) {
+          if (!shiftKey && document.activeElement === sentinelEndRef.current) {
+            sentinelStartRef.current?.focus({ preventScroll: true });
+          } else if (
+            shiftKey &&
+            document.activeElement === sentinelStartRef.current
+          ) {
+            sentinelEndRef.current?.focus({ preventScroll: true });
+          }
+        }
+        break;
+      }
+
+      // Close
+      case KeyCode.ESC: {
+        if (onClose && keyboard) {
+          onClose(event);
+        }
+        break;
+      }
+    }
+  };
+
+  // ========================== Control ===========================
+  // Auto Focus
+  React.useEffect(() => {
+    if (open && autoFocus) {
+      panelRef.current?.focus({ preventScroll: true });
+    }
+  }, [open, autoFocus]);
+
   // ============================ Push ============================
   const [pushed, setPushed] = React.useState(false);
 
@@ -130,8 +180,6 @@ export default function DrawerPopup(props: DrawerPopupProps) {
   );
 
   // ========================= ScrollLock =========================
-  const panelRef = React.useRef<DrawerPanelRef>();
-
   // Tell parent to push
   React.useEffect(() => {
     if (open) {
@@ -157,20 +205,6 @@ export default function DrawerPopup(props: DrawerPopupProps) {
     [],
   );
 
-  // ========================== Control ===========================
-  // Auto Focus
-  React.useEffect(() => {
-    if (open && autoFocus) {
-      panelRef.current?.focus();
-    }
-  }, [open, autoFocus]);
-
-  const onPanelClose: React.KeyboardEventHandler<HTMLDivElement> = event => {
-    if (onClose && keyboard) {
-      onClose(event);
-    }
-  };
-
   // =========================== zIndex ===========================
   const zIndexStyle: React.CSSProperties = {};
   if (zIndex) {
@@ -252,7 +286,6 @@ export default function DrawerPopup(props: DrawerPopupProps) {
         {({ className: motionClassName, style: motionStyle }, motionRef) => {
           return (
             <DrawerPanel
-              ref={panelRef}
               containerRef={motionRef}
               prefixCls={prefixCls}
               className={classNames(className, motionClassName)}
@@ -263,7 +296,6 @@ export default function DrawerPopup(props: DrawerPopupProps) {
               width={width}
               height={height}
               placement={placement}
-              onClose={onPanelClose}
             >
               {children}
             </DrawerPanel>
@@ -286,9 +318,26 @@ export default function DrawerPopup(props: DrawerPopupProps) {
           },
         )}
         style={rootStyle}
+        tabIndex={-1}
+        ref={panelRef}
+        onKeyDown={onPanelKeyDown}
       >
         {maskNode}
+        <div
+          tabIndex={0}
+          ref={sentinelStartRef}
+          style={sentinelStyle}
+          aria-hidden="true"
+          data-sentinel="start"
+        />
         {panelNode}
+        <div
+          tabIndex={0}
+          ref={sentinelEndRef}
+          style={sentinelStyle}
+          aria-hidden="true"
+          data-sentinel="end"
+        />
       </div>
     </DrawerContext.Provider>
   );
diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
index 0b9faae9..a72d9597 100755
--- a/tests/index.spec.tsx
+++ b/tests/index.spec.tsx
@@ -236,12 +236,12 @@ describe('rc-drawer-menu', () => {
       </Drawer>,
     );
 
-    const list = Array.from(
-      container.querySelector('.rc-drawer-content').children,
-    ) as HTMLElement[];
-
-    const firstSentinel = list[0];
-    const lastSentinel = list[2];
+    const firstSentinel = container.querySelector<HTMLElement>(
+      '[data-sentinel="start"]',
+    );
+    const lastSentinel = container.querySelector<HTMLElement>(
+      '[data-sentinel="end"]',
+    );
 
     // First shift to last
     firstSentinel.focus();