diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index 133e5a9..358a9f2 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -27,6 +27,11 @@
 <br/>
 <a href="@($"/servers/add")" class="btn btn-primary">Add</a>
 <br/>
+<div class="input-group mb-3">
+  <input type="text" class="form-control" placeholder="Search servers" @onchange="HandleServerFilterChange" />
+  <button class="btn btn-outline-secondary" type="button" id="button-search" @onclick="HandleSearch">Search</button>
+</div>
+<br/>
 
 <ul>
   @foreach(var server in servers)
@@ -53,6 +58,7 @@
   private List<string> cities = ServersRepository.GetCities();
   private List<Server> servers = ServersRepository.GetServersByCity("Eindhoven");
   private string selectedCity = "Eindhoven";
+  private string serverFilter = "";
 
   private void DeleteServer(int serverId)
   {
@@ -68,4 +74,15 @@
     this.selectedCity = cityName;
     this.servers = ServersRepository.GetServersByCity(this.selectedCity);
   }
+
+  private void HandleServerFilterChange(ChangeEventArgs args)
+  {
+    serverFilter = args.Value?.ToString() ?? string.Empty;
+  }
+
+  private void HandleSearch()
+  {
+    this.servers = ServersRepository.SearchServers(serverFilter);
+    this.selectedCity = string.Empty;
+  }
 }
\ No newline at end of file