diff --git a/Sora/Views/MediaInfoView/MediaInfoView.swift b/Sora/Views/MediaInfoView/MediaInfoView.swift
index 1a8d6d1..e307f73 100644
--- a/Sora/Views/MediaInfoView/MediaInfoView.swift
+++ b/Sora/Views/MediaInfoView/MediaInfoView.swift
@@ -103,7 +103,6 @@ struct MediaInfoView: View {
                 .navigationBarHidden(true)
                 .navigationBarTitleDisplayMode(.inline)
                 .navigationBarTitle("")
-                .navigationViewStyle(StackNavigationViewStyle())
                 .ignoresSafeArea(.container, edges: .top)
                 .onAppear {
                     if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
@@ -287,7 +286,6 @@ struct MediaInfoView: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarTitle("")
-        .navigationViewStyle(StackNavigationViewStyle())
         .ignoresSafeArea(.container, edges: .top)
     }
     
diff --git a/Sora/Views/SearchView.swift b/Sora/Views/SearchView/SearchView.swift
similarity index 99%
rename from Sora/Views/SearchView.swift
rename to Sora/Views/SearchView/SearchView.swift
index 867a1f3..e5509fa 100644
--- a/Sora/Views/SearchView.swift
+++ b/Sora/Views/SearchView/SearchView.swift
@@ -39,7 +39,9 @@ struct SearchView: View {
     @State private var saveDebounceTimer: Timer?
     @State private var searchDebounceTimer: Timer?
     
-    private let columns = [GridItem(.adaptive(minimum: 150))]
+    private var columns: [GridItem] {
+        Array(repeating: GridItem(.flexible(), spacing: 16), count: columnsCount)
+    }
     
     init(searchQuery: Binding<String>) {
         self._searchQuery = searchQuery
@@ -122,7 +124,6 @@ struct SearchView: View {
             }
             .navigationBarHidden(true)
         }
-        .navigationViewStyle(StackNavigationViewStyle())
         .onAppear {
             loadSearchHistory()
             if !searchQuery.isEmpty {
@@ -161,6 +162,7 @@ struct SearchView: View {
                 }
             }
         }
+        .navigationViewStyle(StackNavigationViewStyle())
     }
     
     private func lockOrientation() {
diff --git a/Sulfur.xcodeproj/project.pbxproj b/Sulfur.xcodeproj/project.pbxproj
index 7668b43..c7dca74 100644
--- a/Sulfur.xcodeproj/project.pbxproj
+++ b/Sulfur.xcodeproj/project.pbxproj
@@ -217,6 +217,7 @@
 		0402DA122DE7B5EC003BB42C /* SearchView */ = {
 			isa = PBXGroup;
 			children = (
+				133D7C7C2D2BE2630075467E /* SearchView.swift */,
 				0402DA162DE7B7B8003BB42C /* SearchViewComponents.swift */,
 				0402DA0F2DE7B5EC003BB42C /* SearchComponents.swift */,
 				0402DA102DE7B5EC003BB42C /* SearchResultsGrid.swift */,
@@ -353,7 +354,6 @@
 				133D7C7F2D2BE2630075467E /* MediaInfoView */,
 				1399FAD22D3AB34F00E97C31 /* SettingsView */,
 				133F55B92D33B53E00E08EEA /* LibraryView */,
-				133D7C7C2D2BE2630075467E /* SearchView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";