diff --git a/app.py b/app.py
index 6bb6af4..31469dc 100644
--- a/app.py
+++ b/app.py
@@ -418,7 +418,7 @@ def get_most_recent_topset_for_exercise(person_id, workout_id):
 
     topset = db.get_most_recent_topset_for_exercise(person_id, exercise_id)
     if not topset:
-        return render_template('partials/new_set_form.html', person_id=person_id, workout_id=workout_id, exercises=exercises, has_value=False)
+        return render_template('partials/new_set_form.html', person_id=person_id, workout_id=workout_id, exercises=exercises, exercise_id=exercise_id, has_value=False)
 
     (repetitions, weight) = topset
     return render_template('partials/new_set_form.html', person_id=person_id, workout_id=workout_id, exercises=exercises, has_value=True, exercise_id=exercise_id, repetitions=repetitions, weight=weight)
diff --git a/templates/partials/new_set_form.html b/templates/partials/new_set_form.html
index f91471d..00d1209 100644
--- a/templates/partials/new_set_form.html
+++ b/templates/partials/new_set_form.html
@@ -18,7 +18,8 @@
                     <select 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"
                         hx-get="{{ url_for('get_most_recent_topset_for_exercise', person_id=person_id, workout_id=workout_id) }}"
-                        hx-target="#new-set-workout-{{ workout_id }}" hx-swap="outerHTML" {% if has_value==True %} _="init js(me)
+                        hx-target="#new-set-workout-{{ workout_id }}" hx-swap="outerHTML" {% if has_value==True or
+                        exercise_id %} _="init js(me)
                             te.Select.getOrCreateInstance(me).setValue('{{ exercise_id | safe }}')
                         end" {% else %} _="init js(me)
                             te.Select.getOrCreateInstance(me)