diff --git a/src/components/documents/folder-actions-menu.tsx b/src/components/documents/folder-actions-menu.tsx
index bdbf593e..0f537448 100644
--- a/src/components/documents/folder-actions-menu.tsx
+++ b/src/components/documents/folder-actions-menu.tsx
@@ -104,6 +104,7 @@ export function FolderActionsMenu({ selectedFolderId, onAfterDelete }: FolderAct
                 title="Delete folder?"
                 description="Subfolders and documents inside will move up to the parent. The folder itself is removed."
                 confirmLabel="Delete folder"
+                loading={deleteMutation.isPending}
                 onConfirm={async () => {
                   try {
                     await deleteMutation.mutateAsync(selectedFolderId as string);
@@ -181,7 +182,9 @@ export function FolderActionsMenu({ selectedFolderId, onAfterDelete }: FolderAct
               Cancel
             </Button>
             <Button
-              disabled={!name.trim() || renameMutation.isPending}
+              disabled={
+                !name.trim() || name.trim() === currentName || renameMutation.isPending
+              }
               onClick={async () => {
                 try {
                   await renameMutation.mutateAsync({