diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
index e9ad565..dc6ef66 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
@@ -1,5 +1,5 @@
 using GameIdeas.BlazorApp.Shared.Components.Popup;
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using GameIdeas.BlazorApp.Shared.Components.Slider;
 using GameIdeas.Shared.Dto;
 using Microsoft.AspNetCore.Components;
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
index f0b5c3d..460ecf6 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
@@ -1,4 +1,4 @@
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Models
+@using GameIdeas.BlazorApp.Shared.Components.Select.Models
 @using GameIdeas.BlazorApp.Shared.Components.SelectSearch
 @using GameIdeas.Shared.Dto
 
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
index 4585358..9447fe8 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
@@ -1,4 +1,4 @@
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using GameIdeas.Shared.Dto;
 using Microsoft.AspNetCore.Components;
 
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor
index 02ac15a..0f2b88a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor
@@ -1,6 +1,6 @@
 @using GameIdeas.BlazorApp.Shared.Components.Search
-@using GameIdeas.BlazorApp.Shared.Components.SelectList
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Models
+@using GameIdeas.BlazorApp.Shared.Components.Select
+@using GameIdeas.BlazorApp.Shared.Components.Select.Models
 @using GameIdeas.BlazorApp.Shared.Components.SelectSearch
 @using GameIdeas.BlazorApp.Shared.Components.SliderRange
 @using GameIdeas.BlazorApp.Shared.Models
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor.cs
index 4e580ca..b116719 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/GameFilter.razor.cs
@@ -1,4 +1,4 @@
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using GameIdeas.BlazorApp.Shared.Components.SliderRange;
 using GameIdeas.BlazorApp.Shared.Models;
 using GameIdeas.Shared.Dto;
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
index 0f3349c..dd57a3a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
@@ -1,7 +1,7 @@
 @using GameIdeas.BlazorApp.Pages.Games
 @using GameIdeas.BlazorApp.Shared.Components.Account
-@using GameIdeas.BlazorApp.Shared.Components.SelectList
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Models
+@using GameIdeas.BlazorApp.Shared.Components.Select
+@using GameIdeas.BlazorApp.Shared.Components.Select.Models
 @using GameIdeas.BlazorApp.Shared.Models
 @using GameIdeas.Resources
 
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
index 5b069a9..d45734a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
@@ -1,6 +1,6 @@
 using GameIdeas.BlazorApp.Shared.Components.Account;
-using GameIdeas.BlazorApp.Shared.Components.SelectList;
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using GameIdeas.BlazorApp.Shared.Models;
 using GameIdeas.Resources;
 using Microsoft.AspNetCore.Components;
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor
similarity index 85%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor
index 3a55b84..24cd220 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor
@@ -1,4 +1,4 @@
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Helpers
+@using GameIdeas.BlazorApp.Shared.Components.Select.Helpers
 
 <div class="select-element @SelectHelper.GetClassFromTheme(Theme)"
      @onclick=HandleElementClicked>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor.cs
similarity index 74%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor.cs
index d5fbfe3..6ce1077 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor.cs
@@ -1,7 +1,7 @@
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList.Components;
+namespace GameIdeas.BlazorApp.Shared.Components.Select.Components;
 
 public partial class SelectRow
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor.css
similarity index 100%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Components/SelectRow.razor.css
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Components/SelectRow.razor.css
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Helpers/SelectHelper.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Helpers/SelectHelper.cs
similarity index 77%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Helpers/SelectHelper.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Helpers/SelectHelper.cs
index 1edc57c..862ceda 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Helpers/SelectHelper.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Helpers/SelectHelper.cs
@@ -1,6 +1,6 @@
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList.Helpers;
+namespace GameIdeas.BlazorApp.Shared.Components.Select.Helpers;
 
 public static class SelectHelper
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectParams.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
similarity index 85%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectParams.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
index 3493283..f904beb 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectParams.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
@@ -1,4 +1,4 @@
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+namespace GameIdeas.BlazorApp.Shared.Components.Select.Models;
 
 public class SelectParams<TItem, THeader>
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectTheme.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectTheme.cs
similarity index 58%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectTheme.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectTheme.cs
index 620118f..63d38ba 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectTheme.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectTheme.cs
@@ -1,4 +1,4 @@
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+namespace GameIdeas.BlazorApp.Shared.Components.Select.Models;
 
 public enum SelectTheme
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectType.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectType.cs
new file mode 100644
index 0000000..f3cb1e2
--- /dev/null
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectType.cs
@@ -0,0 +1,7 @@
+namespace GameIdeas.BlazorApp.Shared.Components.Select.Models;
+
+public enum SelectType
+{
+    Single,
+    Multiple
+}
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
similarity index 92%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
index 9e85aab..77b416d 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
@@ -1,6 +1,6 @@
 @using GameIdeas.BlazorApp.Shared.Components.BackdropFilter
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Components
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Helpers
+@using GameIdeas.BlazorApp.Shared.Components.Select.Components
+@using GameIdeas.BlazorApp.Shared.Components.Select.Helpers
 
 @typeparam TItem
 @typeparam THeader
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor.cs
similarity index 84%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor.cs
index 6e7d479..fe4bc56 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor.cs
@@ -1,7 +1,7 @@
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using Microsoft.AspNetCore.Components;
 
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList;
+namespace GameIdeas.BlazorApp.Shared.Components.Select;
 
 public partial class Select<TItem, THeader>
 {
@@ -13,14 +13,21 @@ public partial class Select<TItem, THeader>
     [Parameter] public SelectParams<TItem, THeader> Params { get; set; } = new();
     [Parameter] public SelectTheme Theme { get; set; }
     [Parameter] public SelectType Type { get; set; } = SelectType.Single;
+    [Parameter] public bool DisableClicked { get; set; } = false;
 
     private bool IsContentOpen = false;
 
     public void Close() =>
         IsContentOpen = false;
 
-    private void HandleButtonClicked() =>
-        IsContentOpen = !IsContentOpen;
+    public void Open() =>
+        IsContentOpen = true;
+
+    private void HandleButtonClicked()
+    {
+        if (!DisableClicked)
+            IsContentOpen = !IsContentOpen;
+    }
 
     private void HandleContentClosed() =>
         IsContentOpen = false;
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor.css
similarity index 100%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Select.razor.css
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor.css
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectType.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectType.cs
deleted file mode 100644
index ef62f6d..0000000
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectList/Models/SelectType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
-
-public enum SelectType
-{
-    Single,
-    Multiple
-}
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor
index 77ef98b..e169a80 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor
@@ -1,19 +1,17 @@
 @using GameIdeas.BlazorApp.Shared.Components.Search
-@using GameIdeas.BlazorApp.Shared.Components.SelectList
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Helpers
-@using GameIdeas.BlazorApp.Shared.Components.SelectList.Models
+@using GameIdeas.BlazorApp.Shared.Components.Select
+@using GameIdeas.BlazorApp.Shared.Components.Select.Helpers
+@using GameIdeas.BlazorApp.Shared.Components.Select.Models
 
 @typeparam TItem
 
-<Select TItem="TItem" THeader="string" Theme="Theme" Type="SelectType.Multiple"
+<Select @ref=Select TItem="TItem" THeader="string" Theme="Theme" Type="SelectType.Multiple" DisableClicked=true
         Params="SelectParams" Values=Values ValuesChanged="HandleValuesChanged">
 
     <div class="@SelectHelper.GetClassFromTheme(Theme)">
-        <SearchInput @ref=SearchInput
-                     Icon="SearchInputIcon.Dropdown"
-                     Placeholder="@Placeholder"
-                     TextChanged="HandleTextChanged"
-                     ClearClicked="HandleClearClicked" />
+        <SearchInput @ref=SearchInput Icon="SearchInputIcon.Dropdown" Placeholder="@Placeholder" 
+                     TextChanged="HandleClearClicked" ClearClicked="HandleClearClicked"
+                     FocusIn="HandleFocusIn" SearchClicked="HandleFocusIn" />
     </div>
 
 </Select>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
index 5bcaa72..a9d03d7 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
@@ -1,5 +1,6 @@
 using GameIdeas.BlazorApp.Shared.Components.Search;
-using GameIdeas.BlazorApp.Shared.Components.SelectList.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select.Models;
+using GameIdeas.BlazorApp.Shared.Components.Select;
 using Microsoft.AspNetCore.Components;
 
 namespace GameIdeas.BlazorApp.Shared.Components.SelectSearch;
@@ -15,6 +16,7 @@ public partial class SelectSearch<TItem>
 
     private SelectParams<TItem, string> SelectParams = new();
     private SearchInput? SearchInput;
+    private Select<TItem, string>? Select;
     protected override void OnParametersSet()
     {
         SelectParams = new()
@@ -36,8 +38,9 @@ public partial class SelectSearch<TItem>
     {
         Values = [];
     }
-    private void HandleTextChanged()
+
+    private void HandleFocusIn()
     {
-        Values = [];
+        Select?.Open();
     }
 }
\ No newline at end of file