2 files changed, 3 insertions, 3 deletions
diff --git a/Sora/Views/Generic/GenericListView.swift b/Sora/Views/Generic/GenericListView.swift
index 53f6bac..679b172 100644
--- a/Sora/Views/Generic/GenericListView.swift
+++ b/Sora/Views/Generic/GenericListView.swift
@@ -87,11 +87,11 @@ struct GenericListView<T: Identifiable & Hashable & GenericItem>: View {
       manager.searchText = item.tags.joined(separator: " ")
       selectedTab = 0
 
-      isPresented.toggle()
-
       if previousProvider == settings.preferredBooru {
         manager.performSearch(settings: settings)
       }
+
+      isPresented.toggle()
     }) {
       GenericItemView(
         item: item,
diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift
index da56811..ecaa971 100644
--- a/Sora/Views/Post/Grid/PostGridView.swift
+++ b/Sora/Views/Post/Grid/PostGridView.swift
@@ -131,7 +131,7 @@ struct PostGridView: View {
               systemImage: "arrow.down.to.line"
             )
           }
-          .disabled(manager.isLoading)
+          .disabled(manager.isLoading || manager.endOfData)
         }
 
         PlatformSpecificToolbarItem {