diff --git a/CHANGELOG.md b/CHANGELOG.md
index d72772441b..ce91727c85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased - React]
 
-- Nothing yet!
+### Fixes
+
+- Fixed transitions being cancelled because of focus auto scroll ([#356](https://github.com/tailwindlabs/headlessui/pull/356))
 
 ## [Unreleased - Vue]
 
diff --git a/packages/@headlessui-react/src/hooks/use-focus-trap.ts b/packages/@headlessui-react/src/hooks/use-focus-trap.ts
index 4e0938a91a..ea1e349006 100644
--- a/packages/@headlessui-react/src/hooks/use-focus-trap.ts
+++ b/packages/@headlessui-react/src/hooks/use-focus-trap.ts
@@ -46,7 +46,7 @@ export function useFocusTrap(
     } else {
       let couldFocus = false
       for (let container of containers.current) {
-        let result = focusIn(container, Focus.First)
+        let result = focusIn(container, Focus.First | Focus.NoScroll)
         if (result === FocusResult.Success) {
           couldFocus = true
           break
diff --git a/packages/@headlessui-vue/src/hooks/use-focus-trap.ts b/packages/@headlessui-vue/src/hooks/use-focus-trap.ts
index 3236a14b69..fe2e83b27f 100644
--- a/packages/@headlessui-vue/src/hooks/use-focus-trap.ts
+++ b/packages/@headlessui-vue/src/hooks/use-focus-trap.ts
@@ -46,7 +46,7 @@ export function useFocusTrap(
     } else {
       let couldFocus = false
       for (let container of containers.value) {
-        let result = focusIn(container, Focus.First)
+        let result = focusIn(container, Focus.First | Focus.NoScroll)
         if (result === FocusResult.Success) {
           couldFocus = true
           break