diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 8069f9c02..baeba4142 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -611,8 +611,6 @@
             "copyPath": "Copy path to clipboard",
             "copiedPath": "Path copied successfully",
             "openFile": "Show track in file manager",
-            "tagsSaved": "Tags saved successfully",
-            "rescanStarted": "Library rescan started",
             "fileNotWritable": "File is not accessible or not writable",
             "triggerRescan": "Trigger library rescan after saving",
             "addField": "Add field…",
diff --git a/src/renderer/features/tag-editor/components/song-edit-modal.tsx b/src/renderer/features/tag-editor/components/song-edit-modal.tsx
index 064a60578..9ca239b51 100644
--- a/src/renderer/features/tag-editor/components/song-edit-modal.tsx
+++ b/src/renderer/features/tag-editor/components/song-edit-modal.tsx
@@ -233,7 +233,11 @@ export const SongEditModal = ({ songs }: { songs: Song[] }) => {
             />
 
             <Group justify="flex-end">
-                <Button onClick={() => closeAllModals()} variant="subtle">
+                <Button
+                    disabled={editor.isSaving}
+                    onClick={() => closeAllModals()}
+                    variant="subtle"
+                >
                     {t('common.cancel', 'Cancel')}
                 </Button>
                 <Button loading={editor.isSaving} onClick={editor.handleSave} variant="filled">
diff --git a/src/renderer/features/tag-editor/hooks/use-metadata-editor.ts b/src/renderer/features/tag-editor/hooks/use-metadata-editor.ts
index 8c4dd06fd..665e13b41 100644
--- a/src/renderer/features/tag-editor/hooks/use-metadata-editor.ts
+++ b/src/renderer/features/tag-editor/hooks/use-metadata-editor.ts
@@ -327,8 +327,6 @@ export const useMetadataEditor = ({ browser, songs: songsProp, utils }: UseMetad
                 return;
             }
 
-            toast.success({ message: t('page.itemDetail.tagsSaved') });
-
             if (artworkOp) {
                 await browser?.clearCache();
             }
@@ -339,7 +337,6 @@ export const useMetadataEditor = ({ browser, songs: songsProp, utils }: UseMetad
                         apiClientProps: { serverId: server.id },
                         query: { ids: resolvedSongs.map((s) => s.id) },
                     });
-                    toast.success({ message: t('page.itemDetail.rescanStarted') });
                 } catch {
                     // non-fatal
                 }