diff --git a/app/screens/LibraryAlbums.tsx b/app/screens/LibraryAlbums.tsx
index 84979b1..c86bcc9 100644
--- a/app/screens/LibraryAlbums.tsx
+++ b/app/screens/LibraryAlbums.tsx
@@ -89,6 +89,7 @@ const AlbumsList = () => {
         overScrollMode="never"
         onEndReached={fetchNextPage}
         onEndReachedThreshold={6}
+        windowSize={5}
       />
       <FilterButton
         data={filterOptions}
diff --git a/app/screens/LibraryArtists.tsx b/app/screens/LibraryArtists.tsx
index 56a8432..d8f2011 100644
--- a/app/screens/LibraryArtists.tsx
+++ b/app/screens/LibraryArtists.tsx
@@ -29,14 +29,11 @@ const ArtistsList = () => {
 
   useEffect(() => {
     switch (filter.type) {
-      case 'alphabeticalByName':
-        setSortedList([...list].sort((a, b) => a.name.localeCompare(b.name)))
-        break
       case 'random':
         setSortedList([...list].sort(() => Math.random() - 0.5))
         break
       case 'starred':
-        setSortedList([...list].sort((a, b) => a.name.localeCompare(b.name)).filter(a => a.starred))
+        setSortedList([...list].filter(a => a.starred))
         break
       default:
         setSortedList([...list])
@@ -54,6 +51,7 @@ const ArtistsList = () => {
         onRefresh={refresh}
         refreshing={refreshing}
         overScrollMode="never"
+        windowSize={3}
       />
       <FilterButton
         data={filterOptions}
diff --git a/app/screens/LibraryPlaylists.tsx b/app/screens/LibraryPlaylists.tsx
index 4f9449d..ccb9b2a 100644
--- a/app/screens/LibraryPlaylists.tsx
+++ b/app/screens/LibraryPlaylists.tsx
@@ -24,6 +24,7 @@ const PlaylistsList = () => {
       onRefresh={refresh}
       refreshing={refreshing}
       overScrollMode="never"
+      windowSize={5}
     />
   )
 }