diff --git a/src/components/modals/NostrEventModal.tsx b/src/components/modals/NostrEventModal.tsx
index 86f27ee2..2f873cff 100644
--- a/src/components/modals/NostrEventModal.tsx
+++ b/src/components/modals/NostrEventModal.tsx
@@ -56,11 +56,11 @@ function CopyableField({
 }
 
 export function NostrEventModal() {
-  useLockScroll();
   const nostrEventModal = useStore((s) => s.nostrEventModal);
   const nostrEventJson = useStore((s) => s.nostrEventJson);
   const nostrEventNevent = useStore((s) => s.nostrEventNevent);
   const relays = useStore((s) => s.relays);
+  useLockScroll(nostrEventModal);
 
   const handleClose = useCallback(() => {
     useStore.setState({
diff --git a/src/components/onboarding/OnboardingOverlay.tsx b/src/components/onboarding/OnboardingOverlay.tsx
index 93454373..b49b072e 100644
--- a/src/components/onboarding/OnboardingOverlay.tsx
+++ b/src/components/onboarding/OnboardingOverlay.tsx
@@ -12,7 +12,7 @@ export default function OnboardingOverlay() {
   const onboardingNostrDone = useStore((s) => s.onboardingNostrDone);
   const onboardingWalletOnly = useStore((s) => s.onboardingWalletOnly);
   const backupFileContent = useStore((s) => s.onboardingBackupFileContent);
-  useLockScroll();
+  useLockScroll(setupModalOpen);
 
   // Reset every onboarding-specific field back to its initial store
   // value. Without this, any sub-step the user navigated into (profile
diff --git a/src/components/wallet/WalletBackupDialog.tsx b/src/components/wallet/WalletBackupDialog.tsx
index a4810cb5..a84696e8 100644
--- a/src/components/wallet/WalletBackupDialog.tsx
+++ b/src/components/wallet/WalletBackupDialog.tsx
@@ -47,7 +47,7 @@ export function WalletBackupDialog({
   const [passwordError, setPasswordError] = useState("");
   const [revealing, setRevealing] = useState(false);
 
-  useLockScroll();
+  useLockScroll(open);
   useEscapeKey(open, onClose);
 
   // Auto-reveal when the session password is known (user is unlocked).
diff --git a/src/components/wallet/WalletPage.tsx b/src/components/wallet/WalletPage.tsx
index 9778e287..5e11f8cf 100644
--- a/src/components/wallet/WalletPage.tsx
+++ b/src/components/wallet/WalletPage.tsx
@@ -36,7 +36,7 @@ export function WalletPage() {
     [close],
   );
 
-  useLockScroll();
+  useLockScroll(walletOpen);
   useEscapeKey(walletOpen, close);
 
   // Wallet setup runs exclusively through the onboarding overlay