diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
index b0396f939f..cf8301d755 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -127,17 +127,14 @@
   } = $derived(getAssetActions($t, asset));
   const sharedLink = getSharedLink();
 
-  // TODO: Enable when edits are ready for release
-  let showEditorButton = $derived(
-    isOwner &&
-      asset.type === AssetTypeEnum.Image &&
-      !(
-        asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR ||
-        (asset.originalPath && asset.originalPath.toLowerCase().endsWith('.insp'))
-      ) &&
-      !(asset.originalPath && asset.originalPath.toLowerCase().endsWith('.gif')) &&
-      !(asset.originalPath && asset.originalPath.toLowerCase().endsWith('.svg')) &&
-      !asset.livePhotoVideoId,
+  const editorDisabled = $derived(
+    !isOwner ||
+      asset.type !== AssetTypeEnum.Image ||
+      asset.livePhotoVideoId ||
+      (asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR &&
+        asset.originalPath.toLowerCase().endsWith('.insp')) ||
+      asset.originalPath.toLowerCase().endsWith('.gif') ||
+      asset.originalPath.toLowerCase().endsWith('.svg'),
   );
 </script>
 
@@ -191,7 +188,7 @@
       <RatingAction {asset} {onAction} />
     {/if}
 
-    {#if showEditorButton}
+    {#if !editorDisabled}
       <EditAction onAction={onEdit} />
     {/if}
 
diff --git a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
index 2622bcece7..c52b63793b 100644
--- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
+++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
@@ -62,7 +62,7 @@
       />
       <p class="text-lg text-immich-fg dark:text-immich-dark-fg capitalize">{$t('editor')}</p>
     </HStack>
-    <Button shape="round" size="small" onclick={applyEdits}>{$t('save')}</Button>
+    <Button shape="round" size="small" onclick={applyEdits} loading={editManager.isApplyingEdits}>{$t('save')}</Button>
   </HStack>
 
   <section>