Updated suggestion

SubhikshaSf4851 · SubhikshaSf4851 · commit 7526be5ebd53 · 2026-03-16T19:34:53.000+05:30
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSearchView.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSearchView.cs
@@ -355,7 +355,6 @@ void OnTextBlockItemClicked(object sender, AdapterView.ItemClickEventArgs e)
 			_textBlock.Text = "";
 			SearchConfirmed?.Invoke(this, EventArgs.Empty);
 			Controller.ItemSelected(item);
-			Controller.QueryConfirmed();
 		}
 
 		void UpdateClearButtonState()
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
@@ -1058,12 +1058,8 @@ void OnSearchItemSelected(object? sender, object e)
 				return;
 			}
 
+			(SearchHandler as ISearchHandlerController)?.ItemSelected(e);
 			_searchController.Active = false;
-			if (SearchHandler is ISearchHandlerController controller)
-			{
-				controller.ItemSelected(e);
-				controller.QueryConfirmed();
-			}
 		}
 
 		void SearchButtonClicked(object? sender, EventArgs e)
diff --git a/src/Controls/src/Core/Shell/SearchHandler.cs b/src/Controls/src/Core/Shell/SearchHandler.cs
@@ -6,6 +6,7 @@
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Devices;
 using static Microsoft.Maui.Controls.VisualElement;
 
 namespace Microsoft.Maui.Controls
@@ -314,6 +315,12 @@ void ISearchHandlerController.ItemSelected(object obj)
 		{
 			OnItemSelected(obj);
 			SetValue(SelectedItemPropertyKey, obj, specificity: SetterSpecificity.FromHandler);
+			if (!(DeviceInfo.Platform == DevicePlatform.WinUI))
+			{
+				// For WinUI the query is confirmed in the QuerySubmitted event, 
+				// so we don't want to call OnQueryConfirmed here as it would cause the command to execute twice
+				OnQueryConfirmed();
+			}
 		}
 
 		void ISearchHandlerController.QueryConfirmed()

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,6 @@ void OnTextBlockItemClicked(object sender, AdapterView.ItemClickEventArgs e)`
`355`	`355`	`_textBlock.Text = "";`
`356`	`356`	`SearchConfirmed?.Invoke(this, EventArgs.Empty);`
`357`	`357`	`Controller.ItemSelected(item);`
`358`		`- Controller.QueryConfirmed();`
`359`	`358`	`}`
`360`	`359`
`361`	`360`	`void UpdateClearButtonState()`
Original file line number	Diff line number	Diff line change
`@@ -1058,12 +1058,8 @@ void OnSearchItemSelected(object? sender, object e)`
`1058`	`1058`	`return;`
`1059`	`1059`	`}`
`1060`	`1060`
	`1061`	`+ (SearchHandler as ISearchHandlerController)?.ItemSelected(e);`
`1061`	`1062`	`_searchController.Active = false;`
`1062`		`- if (SearchHandler is ISearchHandlerController controller)`
`1063`		`- {`
`1064`		`- controller.ItemSelected(e);`
`1065`		`- controller.QueryConfirmed();`
`1066`		`- }`
`1067`	`1063`	`}`
`1068`	`1064`
`1069`	`1065`	`void SearchButtonClicked(object? sender, EventArgs e)`