diff --git a/app.py b/app.py
index 9713b87..6bb6af4 100644
--- a/app.py
+++ b/app.py
@@ -182,8 +182,11 @@ def get_workout_modal(person_id, workout_id):
 def create_workout(person_id):
     new_workout_id = db.create_workout(person_id)
     workout = db.get_workout(person_id, new_workout_id)
+    (person_tags, workout_tags, selected_workout_tag_ids) = db.get_workout_tags(
+        person_id, new_workout_id)
+    exercises = db.get_all_exercises()
     return render_template('partials/workout_modal.html',
-                           workout=workout), 200, {"HX-Trigger": "updatedPeople"}
+                           workout=workout, person_tags=person_tags, workout_tags=workout_tags, selected_workout_tag_ids=selected_workout_tag_ids, exercises=exercises), 200, {"HX-Trigger": "updatedPeople"}
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/delete", methods=['DELETE'])