diff --git a/.gitignore b/.gitignore
index 59ee6d907..45bcc048f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,6 @@ MigrationBackup/
 # Repo-specific additions
 src/Toolkit/Toolkit.UWP/LocalizedStrings/*/Resources.resw
 Output
+
+# Rider Files
+.idea
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.cs b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.cs
index 56e30db61..e84503f94 100644
--- a/src/Toolkit/Toolkit.Maui/SearchView/SearchView.cs
+++ b/src/Toolkit/Toolkit.Maui/SearchView/SearchView.cs
@@ -27,7 +27,7 @@
 using Grid = Microsoft.Maui.Controls.Grid;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui;
-
+
 /// <summary>
 /// View for searching with locators and custom search sources.
 /// </summary>
@@ -78,28 +78,28 @@ public SearchView()
 
         BindingContext = this;
         SearchViewModel = new SearchViewModel();
-        InitializeLocalizedStrings();
+        InitializeLocalizedStrings();
         _resultOverlay = new GraphicsOverlay { Id = "SearchView_Result_Overlay" };
         ClearCommand = new DelegateCommand(HandleClearSearchCommand);
         SearchCommand = new DelegateCommand(HandleSearchCommand);
-        RepeatSearchHereCommand = new DelegateCommand(HandleRepeatSearchHereCommand);
-        Loaded += SearchView_Loaded;
-    }
-
-    private void SearchView_Loaded(object? sender, EventArgs e)
-    {
-        if (GeoView != null)
-        {
-            HandleViewpointChanged();
-        }
-        _ = ConfigureForCurrentConfiguration();
-    }
-
-    private void InitializeLocalizedStrings()
-    {
-        NoResultMessage = Properties.Resources.GetString("SearchViewNoResults");
-        AllSourcesSelectText = Properties.Resources.GetString("SearchViewAllSourcesSelect");
-        RepeatSearchButtonText = Properties.Resources.GetString("SearchViewRepeatSearch");
+        RepeatSearchHereCommand = new DelegateCommand(HandleRepeatSearchHereCommand);
+        Loaded += SearchView_Loaded;
+    }
+
+    private void SearchView_Loaded(object? sender, EventArgs e)
+    {
+        if (GeoView != null)
+        {
+            HandleViewpointChanged();
+        }
+        _ = ConfigureForCurrentConfiguration();
+    }
+
+    private void InitializeLocalizedStrings()
+    {
+        NoResultMessage = Properties.Resources.GetString("SearchViewNoResults");
+        AllSourcesSelectText = Properties.Resources.GetString("SearchViewAllSourcesSelect");
+        RepeatSearchButtonText = Properties.Resources.GetString("SearchViewRepeatSearch");
     }
 
     /// <summary>
@@ -313,6 +313,9 @@ private void PART_Entry_TextChanged(object? sender, TextChangedEventArgs e)
     {
         if (SearchViewModel != null)
         {
+            //JH:  Added for collapsing dialog when user starts typing in search
+            _sourceSelectToggled = false;
+            UpdateVisibility();
             SearchViewModel.CurrentQuery = e.NewTextValue;
         }
     }