diff --git a/components/Artist/component.tsx b/components/Artist/component.tsx
index 4239c7a5..cb0cdfc5 100644
--- a/components/Artist/component.tsx
+++ b/components/Artist/component.tsx
@@ -1,12 +1,15 @@
 import { ScrollView } from "tamagui";
 import Avatar from "../helpers/avatar";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 export default function Artist({ artistId, artistName }: { artistId: string, artistName: string  }): React.JSX.Element {
     return (
-        <ScrollView>
-            <Avatar itemId={artistId}>
-                {artistName}
-            </Avatar>
-        </ScrollView>
+        <SafeAreaView>
+            <ScrollView>
+                <Avatar itemId={artistId}>
+                    {artistName}
+                </Avatar>
+            </ScrollView>
+        </SafeAreaView>
     )
 }
\ No newline at end of file
diff --git a/components/Home/component.tsx b/components/Home/component.tsx
index c87e6b68..a1377a7f 100644
--- a/components/Home/component.tsx
+++ b/components/Home/component.tsx
@@ -9,6 +9,7 @@ import { HomeProvider, useHomeContext } from "./provider";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import { HomeStackParamList, ProvidedHomeProps } from "./types";
 import { HomeArtistScreen } from "./screens/artist";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 export const Stack = createNativeStackNavigator<HomeStackParamList>();
 
@@ -48,20 +49,21 @@ function ProvidedHome({ route, navigation }: ProvidedHomeProps): React.JSX.Eleme
     const { refreshing: refetching, onRefresh: onRefetch } = useHomeContext()
 
     return (
-        <ScrollView 
-            paddingLeft={10}
-            refreshControl={
-            <RefreshControl 
-                refreshing={refetching} 
-                onRefresh={onRefetch}
-            />
-        }>
-            <YStack alignContent='flex-start'>
-                <H2>{`Hi, ${user!.name}`}</H2>
-                
-                <RecentArtists route={route} navigation={navigation} />
-                <RecentlyPlayed />
-            </YStack>
-        </ScrollView>
+        <SafeAreaView>
+            <ScrollView 
+                paddingLeft={10}
+                refreshControl={
+                    <RefreshControl 
+                    refreshing={refetching} 
+                    onRefresh={onRefetch}
+                    />
+                }>
+                <YStack alignContent='flex-start'>
+                    <H2>{`Hi, ${user!.name}`}</H2>
+                    <RecentArtists route={route} navigation={navigation} />
+                    <RecentlyPlayed />
+                </YStack>
+            </ScrollView>
+        </SafeAreaView>
     );
 }
\ No newline at end of file
diff --git a/components/jellify.tsx b/components/jellify.tsx
index 6c6a4a90..043cb010 100644
--- a/components/jellify.tsx
+++ b/components/jellify.tsx
@@ -8,6 +8,7 @@ import { DarkTheme, DefaultTheme, NavigationContainer } from "@react-navigation/
 import Navigation from "./navigation";
 import Login from "./Login/component";
 import { JellyfinAuthenticationProvider } from "./Login/provider";
+import { SafeAreaProvider } from "react-native-safe-area-context";
 
 export default function Jellify(): React.JSX.Element {
 
@@ -29,11 +30,13 @@ function App(): React.JSX.Element {
   
   return (
     <NavigationContainer theme={isDarkMode ? DarkTheme : DefaultTheme}>
+      <SafeAreaProvider>
         { library ? <Navigation /> : (
           <JellyfinAuthenticationProvider>
             <Login /> 
           </JellyfinAuthenticationProvider>
         )}
+      </SafeAreaProvider>
     </NavigationContainer>
   );
 }
\ No newline at end of file