diff --git a/src/view/com/modals/EditProfile.tsx b/src/view/com/modals/EditProfile.tsx
index 50acccf673..1b5c99d977 100644
--- a/src/view/com/modals/EditProfile.tsx
+++ b/src/view/com/modals/EditProfile.tsx
@@ -65,8 +65,8 @@ export function Component({
 
   return (
     <View style={s.flex1}>
-      <Text style={[s.textCenter, s.bold, s.f16]}>Edit my profile</Text>
       <BottomSheetScrollView style={styles.inner}>
+        <Text style={styles.title}>Edit my profile</Text>
         {error !== '' && (
           <View style={s.mb10}>
             <ErrorMessage message={error} />
@@ -114,6 +114,12 @@ const styles = StyleSheet.create({
   inner: {
     padding: 14,
   },
+  title: {
+    textAlign: 'center',
+    fontWeight: 'bold',
+    fontSize: 24,
+    marginBottom: 18,
+  },
   group: {
     marginBottom: 10,
   },
diff --git a/src/view/com/modals/Modal.tsx b/src/view/com/modals/Modal.tsx
index 9d70334115..47b6274353 100644
--- a/src/view/com/modals/Modal.tsx
+++ b/src/view/com/modals/Modal.tsx
@@ -35,7 +35,7 @@ export const Modal = observer(function Modal() {
     } else {
       bottomSheetRef.current?.close()
     }
-  }, [store.shell.isModalActive, bottomSheetRef])
+  }, [store.shell.isModalActive, bottomSheetRef, store.shell.activeModal?.name])
 
   let snapPoints: (string | number)[] = CLOSED_SNAPPOINTS
   let element