diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs
index 64db00c3e1..da133125a8 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs
@@ -567,8 +567,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
                     WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
                 }
 
-                TextToSuggest = item.TextToSuggest;
-                WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(item.TextToSuggest));
+                var suggestion = item.TextToSuggest;
+                DoOnUiThread(() =>
+                {
+                    TextToSuggest = suggestion;
+                    WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(suggestion));
+                });
             },
             ct);
     }