diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.css
index 4d3a824..c3b7e0a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.css
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.css
@@ -34,6 +34,7 @@
     grid-column: 2;
     box-sizing: border-box;
     color: var(--white);
+    padding: 0 8px;
 }
 
 ::deep input[type="date"]::-webkit-calendar-picker-indicator {
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 4711aef..f38bff9 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
@@ -37,7 +37,7 @@ public partial class SelectSearch<TItem>
 
     protected override void OnAfterRender(bool firstRender)
     {
-        if (Values != null)
+        if (firstRender && Values != null)
         {
             SearchInput?.SetText(string.Join(", ", Values.Select(GetLabel)));
         }