diff --git a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
index 1a1f731fad2..c1314f02878 100644
--- a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
@@ -261,10 +261,12 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
           )}
           ref={panel}
           onTransitionEnd={(ev) => {
-            if (!hidden && ev.nativeEvent.propertyName === 'transform') {
-              onExpand();
+            if (ev.target as HTMLElement === panel.current) {
+              if (!hidden && ev.nativeEvent.propertyName === 'transform') {
+                onExpand();
+              }
+              setIsExpandedInternal(!hidden);
             }
-            setIsExpandedInternal(!hidden);
           }}
           hidden={hidden}
           {...((defaultSize || minSize || maxSize) && {