diff --git a/frontend/static/index.html b/frontend/static/index.html
index 0c39a1f4..fc52637b 100644
--- a/frontend/static/index.html
+++ b/frontend/static/index.html
@@ -91,7 +91,8 @@
 	      Tags
 	    </a>
 	    <div class="dropdown-menu niceborder">
-	      <a ng-repeat="(tname,tag) in tags" ng-class="{active: tname == current_tag}" class="dropdown-item" ng-href="/tags/{{ tname }}">#{{ tname }} <span class="badge badge-light"><span ng-if="(my.team_id)">{{ tag.solved }}/</span>{{ tag.count }}</span></a>
+	      <input type="search" class="dropdown-item" placeholder="Filtrer" id="filtertag" ng-model="filtertag">
+	      <a ng-repeat="tname in tagsl | filter: filtertag" ng-class="{active: tname == current_tag}" class="dropdown-item" ng-href="/tags/{{ tname }}">#{{ tname }} <span class="badge badge-light"><span ng-if="(my.team_id)">{{ tags[tname].solved }}/</span>{{ tags[tname].count }}</span></a>
 	    </div>
 	  </li>
 	  <li class="nav-item">
diff --git a/frontend/static/js/challenge.js b/frontend/static/js/challenge.js
index 34de7ca1..6f9abc25 100644
--- a/frontend/static/js/challenge.js
+++ b/frontend/static/js/challenge.js
@@ -131,6 +131,7 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
 		    });
 		});
 		$scope.tags = tags;
+		$scope.tagsl = Object.keys(tags);
 	    }
 	}