2 files changed, 5 insertions, 1 deletions
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/SelectLocationViewModel.swift b/ios/MullvadVPN/View controllers/SelectLocation/SelectLocationViewModel.swift
index 77f044f2d5..27aecb69a2 100644
--- a/ios/MullvadVPN/View controllers/SelectLocation/SelectLocationViewModel.swift
+++ b/ios/MullvadVPN/View controllers/SelectLocation/SelectLocationViewModel.swift
@@ -152,6 +152,10 @@ class SelectLocationViewModelImpl: SelectLocationViewModel {
             .sink { [weak self] prevValue, newValue in
                 if prevValue == newValue { return }
                 if prevValue == nil && newValue == "" { return }
+                // to avoid all relays being expanded
+                if !newValue.isEmpty && "wg-".hasPrefix(newValue.lowercased()) {
+                    return
+                }
                 self?.search(searchText: newValue)
                 if newValue == "" {
                     self?.expandSelectedLocation()
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/Views/ExitLocationView.swift b/ios/MullvadVPN/View controllers/SelectLocation/Views/ExitLocationView.swift
index 86b028fb0a..5b2574480b 100644
--- a/ios/MullvadVPN/View controllers/SelectLocation/Views/ExitLocationView.swift
+++ b/ios/MullvadVPN/View controllers/SelectLocation/Views/ExitLocationView.swift
@@ -23,7 +23,7 @@ struct ExitLocationView<ViewModel: SelectLocationViewModel>: View {
         ScrollViewReader { scrollProxy in
             // All items in the list are arranged in a flat hierarchy
             ScrollView {
-                LazyVStack(spacing: 0) {
+                VStack(spacing: 0) {
                     Group {
                         if !context.filter.isEmpty {
                             ActiveFilterView(