diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index eda34dd8..fd26f5ed 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -489,6 +489,8 @@ let events_session_data_struct: key_val = {
         show__session_poc_profile: false,
         show_modal__session_poc_agree: false,
 
+        show__edit_location: {},
+
         status_rpt: {
             recent_files: null,
             presenters_agree: null,
diff --git a/src/routes/events/ae_comp__event_session_obj_li.svelte b/src/routes/events/ae_comp__event_session_obj_li.svelte
index 4d82a1bb..785d58b6 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -281,10 +281,11 @@ let ae_triggers: key_val = $state({});
             current_field_value={session_obj?.event_location_id_random}
 
             allow_null={true}
+            select_option_li={$slct.location_obj_kv}
 
             hide_element={!$ae_loc.edit_mode}
-            hide_edit_btn={false}
-            hide_edit_form={true}
+            hide_edit_btn={true}
+            hide_edit_form={$events_sess.pres_mgmt.show__edit_location[session_obj?.event_session_id_random] !== true}
 
             outline_element={false}
             display_inline={true}
@@ -350,6 +351,8 @@ let ae_triggers: key_val = $state({});
 
                         ae_tmp.event_location_id = null;
                         ae_tmp.show__edit_event_location = false;
+
+                        $events_sess.pres_mgmt.show__edit_location[session_obj?.event_session_id_random] = false;
                     }}
                     class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500"
                     >
@@ -399,6 +402,9 @@ let ae_triggers: key_val = $state({});
                             console.log(`Finally...`);
                             ae_tmp.event_location_id = session_obj?.event_location_id_random;
                             ae_tmp.show__edit_event_location = true;
+
+                            $events_sess.pres_mgmt.show__edit_location[session_obj?.event_session_id_random] = true;
+
                         });
                     }}
                     class="btn btn-sm preset-tonal-warning group"