diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Search/SearchInput.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Search/SearchInput.razor.cs
index 4d08c04..d8f6e14 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Search/SearchInput.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Search/SearchInput.razor.cs
@@ -28,10 +28,12 @@ public partial class SearchInput
     private async Task HandleClearClicked()
     {
         Text = string.Empty;
+        await TextChanged.InvokeAsync(string.Empty);
         await ClearClicked.InvokeAsync();
     }
     private async Task HandleSearchClicked()
     {
+        await TextChanged.InvokeAsync(Text);
         await SearchClicked.InvokeAsync();
     }
 }
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor
index 8a5b730..92856da 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor
@@ -8,7 +8,7 @@
                      Icon="SearchInputIcon.Dropdown"
                      TextChanged="HandleTextChanged"
                      ClearClicked="HandleTextChanged"
-                     SearchClicked="Open" />
+                     SearchClicked="Toggle" />
     </div>
     <div @onfocusout=HandleFocusOut
          class="select-container @(AlignRight ? "align-right" : "")"
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor.cs
index 621f0d5..7b4209d 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/MultipleSelectList.razor.cs
@@ -19,6 +19,8 @@ public partial class MultipleSelectList<TItem>
 
     public void Close() => ContentVisile = false;
 
+    public void Toggle() => ContentVisile = !ContentVisile;
+
     private void HandleFocusOut() => Close();
 
     private void HandleFocusIn() => Open();
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Layouts/Header/HeaderLayout.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Layouts/Header/HeaderLayout.razor
index 9c1b917..17f9cc6 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Layouts/Header/HeaderLayout.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Layouts/Header/HeaderLayout.razor
@@ -2,6 +2,7 @@
 @using GameIdeas.BlazorApp.Pages.Games.Models
 @using GameIdeas.BlazorApp.Shared.Components.Account
 @using GameIdeas.BlazorApp.Shared.Components.Select
+@using GameIdeas.BlazorApp.Shared.Components.Select.Models
 @using GameIdeas.Resources
 
 @inherits LayoutComponentBase