diff --git a/src/components/Shadow.tsx b/src/components/Shadow.tsx
index 2c8e855..c366edd 100644
--- a/src/components/Shadow.tsx
+++ b/src/components/Shadow.tsx
@@ -1,33 +1,34 @@
 import React, { PropsWithChildren } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-export const shadowSmall = StyleSheet.create({
-    shadowColor: "#000",
-    shadowOffset: {
-    width: 0,
-        height: 2,
+export const shadow = StyleSheet.create({
+    small: {
+        shadowColor: '#000',
+        shadowOffset: {
+            width: 0,
+            height: 2,
+        },
+        shadowOpacity: 0.1,
+        shadowRadius: 2.62,
+        elevation: 4,
     },
-    shadowOpacity: 0.1,
-    shadowRadius: 2.62,
-    elevation: 4,
-});
-
-export const shadowMedium = StyleSheet.create({
-    shadowColor: "#000",
-    shadowOffset: {
-        width: 0,
-        height: 3,
-    },
-    shadowOpacity: 0.1,
-    shadowRadius: 4.65,
-    elevation: 6,
+    medium: {
+        shadowColor: '#000',
+        shadowOffset: {
+            width: 0,
+            height: 3,
+        },
+        shadowOpacity: 0.1,
+        shadowRadius: 4.65,
+        elevation: 6,
+    }
 });
 
 type SizeProp = 'small' | 'medium';
 
 const shadowMap: Record<SizeProp, StyleSheet.NamedStyles<unknown>> = {
-    'small': shadowSmall,
-    'medium': shadowMedium,
+    'small': shadow.small,
+    'medium': shadow.medium,
 };
 
 export const ShadowWrapper = ({ children, size = 'small' }: PropsWithChildren<{ size?: SizeProp }>) => (
diff --git a/src/screens/Music/overlays/NowPlaying/index.tsx b/src/screens/Music/overlays/NowPlaying/index.tsx
index 403daea..814b72e 100644
--- a/src/screens/Music/overlays/NowPlaying/index.tsx
+++ b/src/screens/Music/overlays/NowPlaying/index.tsx
@@ -15,6 +15,7 @@ import useDefaultStyles, { ColoredBlurView } from 'components/Colors';
 import { useNavigation } from '@react-navigation/native';
 import { calculateProgressTranslation } from 'components/Progresstrack';
 import { THEME_COLOR } from 'CONSTANTS';
+import { MusicNavigationProp } from 'screens/Music/types';
 
 const NOW_PLAYING_POPOVER_MARGIN = 6;
 const NOW_PLAYING_POPOVER_WIDTH = Dimensions.get('screen').width - 2 * NOW_PLAYING_POPOVER_MARGIN;
@@ -111,7 +112,7 @@ function NowPlaying() {
     const { index, track } = useCurrentTrack();
     const { buffered, duration, position } = useProgress();
     const previousIndex = usePrevious(index);
-    const navigation = useNavigation();
+    const navigation = useNavigation<MusicNavigationProp>();
 
     const bufferAnimation = useRef(new Animated.Value(0));
     const progressAnimation = useRef(new Animated.Value(0));
diff --git a/src/screens/Search/index.tsx b/src/screens/Search/index.tsx
index f2adfe4..ca87c1c 100644
--- a/src/screens/Search/index.tsx
+++ b/src/screens/Search/index.tsx
@@ -272,7 +272,7 @@ export default function Search() {
                 </View>
             </ScrollView> */}
         </View>
-    ), [searchTerm, setSearchTerm, defaultStyles, isLoading]);
+    ), [searchTerm, setSearchTerm, defaultStyles, isLoading, keyboardHeight]);
 
     // GUARD: We cannot search for stuff unless Fuse is loaded with results.
     // Therefore we delay rendering to when we are certain it's there.