diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
index 8ea63fb2..9343d841 100644
--- a/src/lib/element_manage_event_file_li.svelte
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -121,7 +121,7 @@ onMount(() => {
 {#each $lq__event_file_obj_li as event_file_obj}
 <tr class="ae_obj obj_event_file border-t border-b border-gray-200 hover:bg-gray-50 hover:border-gray-300">
     <td class="event_file__file align-middle">
-        {#if !$events_sess.pres_mgmt?.show_field_edit__filename}
+        {#if $events_sess.pres_mgmt?.show_field_edit__filename != event_file_obj.event_file_id_random}
         <button
             disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
             on:click={() => {
@@ -180,12 +180,22 @@ onMount(() => {
                 placeholder="Filename"
                 bind:value="{$events_sess.pres_mgmt.tmp_val__filename_no_ext}"
                 data-original_value="{event_file_obj.filename}"
-                class="input min-w-72 lg:min-w-96 text-sm"
+                class="input min-w-72 lg:min-w-96 text-sm bg-warning-100"
+                title="Rename this file. No extension."
                 >
             {#if $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim() != event_file_obj.filename_no_ext}
             <button
                 on:click={async () => {
-                    let new_filename = $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim() + '.' + event_file_obj.extension;
+                    let new_filename = $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim()
+                    // Remove possible double extension
+                    new_filename = new_filename.replace('.'+event_file_obj.extension, '');
+
+                    // Add the extension back
+                    new_filename = new_filename + '.' + event_file_obj.extension;
+
+                    // Remove any double dots
+                    new_filename = new_filename.replace(/\.\./g, '.');
+
                     let event_file_data = {
                         filename: new_filename,
                     };
@@ -227,15 +237,20 @@ onMount(() => {
         <button
             disabled={!allow_basic && !$ae_loc.trusted_access}
             on:click={() => {
-                $events_sess.pres_mgmt.tmp_val__filename_no_ext = event_file_obj.filename_no_ext;
-                $events_sess.pres_mgmt.show_field_edit__filename = !$events_sess.pres_mgmt.show_field_edit__filename;
+                if ($events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random) {
+                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = '';
+                    $events_sess.pres_mgmt.show_field_edit__filename = false;
+                } else {
+                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = event_file_obj.filename_no_ext;
+                    $events_sess.pres_mgmt.show_field_edit__filename = event_file_obj.event_file_id_random;
+                }
             }}
             class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            class:variant-glass-warning={$events_sess.pres_mgmt.show_field_edit__filename}
+            class:variant-glass-warning={$events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random}
             title={`Rename this file? "${event_file_obj.filename}"`}
             >
             <span class="fas fa-edit mx-1"></span>
-            {#if $events_sess.pres_mgmt.show_field_edit__filename}
+            {#if $events_sess.pres_mgmt?.show_field_edit__filename == event_file_obj.event_file_id_random}
                 Cancel?
             {:else}
                 Rename