diff --git a/TASVideos/Pages/Games/Edit.cshtml b/TASVideos/Pages/Games/Edit.cshtml
index 40204ac80..d353e1b15 100644
--- a/TASVideos/Pages/Games/Edit.cshtml
+++ b/TASVideos/Pages/Games/Edit.cshtml
@@ -59,8 +59,10 @@
 			</form-group>
 		</div>
 	</row>
-	<two-column-select id-list="Game.Genres" available-list="@Model.AvailableGenres"/>
-	<two-column-select id-list="Game.Groups" available-list="@Model.AvailableGroups"/>
+	<select asp-for="Game.Genres" size="@(Math.Min(Model.Game.Genres.Count(), 7).ToString())" asp-items="Model.AvailableGenres" class="form-control"></select>
+	<select-improver select-id="@Html.IdFor(m => m.Game.Genres)"></select-improver>
+	<select asp-for="Game.Groups" size="@(Math.Min(Model.Game.Groups.Count(), 7).ToString())" asp-items="Model.AvailableGroups" class="form-control"></select>
+	<select-improver select-id="@Html.IdFor(m => m.Game.Groups)"></select-improver>
 	<hr />
 	<div class="text-center">
 		<button id="submit-btn" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save</button>