diff --git a/app.py b/app.py
index 54ad2c7..b3e5185 100644
--- a/app.py
+++ b/app.py
@@ -442,7 +442,17 @@ def show_workout(person_id, workout_id):
 def get_exercises():
     query = request.args.get('query')
     exercises = db.exercises.get(query)
-    return render_template('partials/exercise_dropdown.html', exercises=exercises)
+    return render_template('partials/exercise/exercise_dropdown.html', exercises=exercises)
+
+@app.route("/exercise/<int:exercise_id>/edit_name", methods=['GET', 'POST'])
+def edit_exercise_name(exercise_id):
+    exercise = db.exercises.get_exercise(exercise_id)
+    if request.method == 'GET':
+        return render_template('partials/exercise/edit_exercise_name.html', exercise=exercise)
+    else:
+        updated_name = request.form['name']
+        updated_exercise = db.exercises.update_exercise_name(exercise_id, updated_name)
+        return render_template('partials/exercise/exercise_list_item.html', exercise=updated_exercise)
 
 
 
diff --git a/features/exercises.py b/features/exercises.py
index 0881995..4d0b846 100644
--- a/features/exercises.py
+++ b/features/exercises.py
@@ -6,4 +6,15 @@ class Exercises:
         # Add wildcards to the query
         search_query = f"%{query}%"
         exercises = self.execute("SELECT exercise_id, name FROM exercise WHERE LOWER(name) LIKE LOWER(%s) ORDER BY name ASC;", [search_query])
-        return exercises
\ No newline at end of file
+        return exercises
+    
+    def get_exercise(self, exercise_id):
+        exercise = self.execute("SELECT exercise_id, name FROM exercise WHERE exercise_id=%s;", [exercise_id], one=True)
+        return exercise
+    
+    def update_exercise_name(self, exercise_id, updated_name):
+        sql = "UPDATE exercise SET name = %s WHERE exercise_id = %s;"
+        params = [updated_name, exercise_id]
+        self.execute(sql, params)
+        updated_exercise = self.get_exercise(exercise_id)
+        return updated_exercise
diff --git a/templates/partials/exercise/edit_exercise_name.html b/templates/partials/exercise/edit_exercise_name.html
new file mode 100644
index 0000000..f03067c
--- /dev/null
+++ b/templates/partials/exercise/edit_exercise_name.html
@@ -0,0 +1,16 @@
+<li class="py-2 px-4 flex items-center justify-between">
+    <!-- Input Field -->
+    <input type="text" name="name" value="{{ exercise.name }}"
+        class="w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-2 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
+        _="on click from me call event.stopPropagation()">
+    <!-- Save Icon -->
+    <button hx-post="{{ url_for('edit_exercise_name', exercise_id=exercise.exercise_id) }}" hx-target="closest li"
+        hx-swap="outerHTML" hx-include="closest li" class="text-gray-500 hover:text-gray-700 ml-2"
+        _="on click from me call event.stopPropagation()">
+        <!-- Tick icon SVG -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+            stroke-width="2">
+            <path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7" />
+        </svg>
+    </button>
+</li>
\ No newline at end of file
diff --git a/templates/partials/exercise/exercise_dropdown.html b/templates/partials/exercise/exercise_dropdown.html
new file mode 100644
index 0000000..4fb079d
--- /dev/null
+++ b/templates/partials/exercise/exercise_dropdown.html
@@ -0,0 +1,9 @@
+{% if exercises %}
+<ul class="list-none m-0 p-0 max-h-[300px] overflow-y-auto">
+    {% for exercise in exercises %}
+    {{ render_partial('partials/exercise/exercise_list_item.html', exercise=exercise) }}
+    {% endfor %}
+</ul>
+{% else %}
+<div class="py-2 px-4 text-gray-500">No results found</div>
+{% endif %}
\ No newline at end of file
diff --git a/templates/partials/exercise/exercise_list_item.html b/templates/partials/exercise/exercise_list_item.html
new file mode 100644
index 0000000..aedcc57
--- /dev/null
+++ b/templates/partials/exercise/exercise_list_item.html
@@ -0,0 +1,14 @@
+<li class="py-2 px-4 hover:bg-gray-100 cursor-pointer flex items-center justify-between">
+    <!-- Exercise Name -->
+    <span>{{ exercise.name }}</span>
+    <!-- Edit Icon -->
+    <a hx-get="{{ url_for('edit_exercise_name', exercise_id=exercise.exercise_id) }}" hx-target="closest li"
+        hx-swap="outerHTML" class="text-gray-500 hover:text-gray-700" _="on click from me call event.stopPropagation()">
+        <!-- Edit icon SVG -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+            stroke-width="2">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                d="M15.232 5.232l3.536 3.536M4 20h4l12-12-4-4L4 16v4z" />
+        </svg>
+    </a>
+</li>
\ No newline at end of file
diff --git a/templates/partials/exercise_dropdown.html b/templates/partials/exercise_dropdown.html
deleted file mode 100644
index 40025f4..0000000
--- a/templates/partials/exercise_dropdown.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% for e in exercises %}
-<option value="{{ e.exercise_id }}">{{
-    e.name
-    }}</option>
-{% endfor %}
\ No newline at end of file
diff --git a/templates/workout.html b/templates/workout.html
index bb1b06e..565eb71 100644
--- a/templates/workout.html
+++ b/templates/workout.html
@@ -95,11 +95,18 @@
                 <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city">
                     Exercise
                 </label>
-                <input
-                    class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    type="text" name="query" placeholder="Search exercises..." hx-get="{{ url_for('get_exercises') }}"
-                    hx-target="#exercise-results" hx-trigger="keyup changed delay:500ms" autocomplete="off">
-                <div id="exercise-results">
+                <div class="relative" _="on click from elsewhere set the innerHTML of #exercise-results to ''">
+                    <input
+                        class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
+                        type="text" name="query" placeholder="Search exercises..."
+                        hx-get="{{ url_for('get_exercises') }}" hx-target="#exercise-results"
+                        hx-trigger="keyup changed delay:500ms" autocomplete="off">
+
+                    <!-- Dropdown Menu -->
+                    <div id="exercise-results"
+                        class="absolute w-full bg-white border border-gray-200 mt-1 rounded shadow-md z-10">
+                        <!-- Results will be injected here -->
+                    </div>
 
                 </div>
             </div>