diff --git a/app.py b/app.py
index 417f2ed..b3efca0 100644
--- a/app.py
+++ b/app.py
@@ -182,7 +182,7 @@ def get_topset(person_id, workout_id, topset_id):
 def get_topset_edit_form(person_id, workout_id, topset_id):
     exercises = db.get_exercises()
     topset = db.get_topset(person_id, workout_id, topset_id)
-    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercises=exercises, exercise_name=topset['ExerciseName'], repetitions=topset['Repetitions'], weight=topset['Weight'], is_edit=True)
+    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercises=exercises, exercise_name=topset['ExerciseName'], repetitions=topset['Repetitions'], weight=topset['Weight'], exercise_id=topset['ExerciseId'], is_edit=True)
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset", methods=['POST'])
diff --git a/templates/partials/topset.html b/templates/partials/topset.html
index 4c61e0c..26d8099 100644
--- a/templates/partials/topset.html
+++ b/templates/partials/topset.html
@@ -3,15 +3,20 @@
         {% if is_edit|default(false, true) == false %}
         {{ exercise_name }}
         {% else %}
-        <select
-            class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-            name="exercise_id">
-            {% for exercise in exercises|default([], true) %}
-            <option value="{{ exercise['ExerciseId'] }}" {% if exercise['Name']==exercise_name %} selected {% endif %}>
-                {{exercise['Name']}}
-            </option>
-            {% endfor %}
-        </select>
+        <div class="w-full">
+            <select id="topset-exercise-select-{{ topset_id }}" data-te-select-init data-te-select-filter="true"
+                data-te-select-size="lg" name="exercise_id"
+                class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500">
+                {% for exercise in exercises|default([], true) %}
+                <option value="{{ exercise['ExerciseId'] }}">{{
+                    exercise['Name']
+                    }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <script>
+            te.Select.getOrCreateInstance(document.querySelector("#topset-exercise-select-{{ topset_id }}")).setValue("{{ exercise_id }}");
+        </script>
         {% endif %}
     </td>
     <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">