diff --git a/components/team-members-editor/index.js b/components/team-members-editor/index.js
index 5776d758..536ca933 100644
--- a/components/team-members-editor/index.js
+++ b/components/team-members-editor/index.js
@@ -9,7 +9,7 @@ import {
     View,
     FlatList
 } from "react-native";
-import { SafeAreaView } from "react-native-safe-area-context";
+import { SafeAreaView, SafeAreaProvider } from "react-native-safe-area-context";
 import { connect } from "react-redux";
 import MemberIcon from "../../components/member-icon";
 import { defaultStyles } from "../../styles/default-styles";
@@ -171,22 +171,26 @@ const TeamMembersEditor = ({ actions, team, members, requests, invitations }: Pr
 
 
     return (
-        <SafeAreaView style={ styles.frame }>
-            <ButtonBar buttonConfigs={ headerButtons }/>
-            <View style={ {
-                flex: 1,
-                backgroundColor: constants.colorBackgroundLight
-            } }>
-                <FlatList data={memberRowData} renderItem={ ({item}) => (<MemberItem item={item} />)}  />
-            </View>
+        <View style={ { flex: 1 } }>
+            <SafeAreaView style={ { backgroundColor: constants.colorBackgroundDark, flex: 1 } }>
+                <ButtonBar buttonConfigs={ headerButtons }/>
+                <View style={ {
+                    flex: 1,
+                    backgroundColor: constants.colorBackgroundLight
+                } }>
+                    <FlatList data={memberRowData} renderItem={ ({item}) => (<MemberItem item={item} />)}  />
+                </View>
+            </SafeAreaView>
             <Modal
                 animationType={ "slide" }
                 onRequestClose={ (): string => ("this function is required. Who knows why?") }
-                transparent={ false }
+                transparent={ true }
                 visible={ isModalVisible }>
-                { modalContent }
+                <SafeAreaProvider>
+                    { modalContent }
+                </SafeAreaProvider>
             </Modal>
-        </SafeAreaView>
+        </View>
     );
 };