diff --git a/apps/files/src/components/FileEntryMixin.ts b/apps/files/src/components/FileEntryMixin.ts
index e6accb7861a..6a6b69b99fc 100644
--- a/apps/files/src/components/FileEntryMixin.ts
+++ b/apps/files/src/components/FileEntryMixin.ts
@@ -144,6 +144,10 @@ export default defineComponent({
 				this.actionsMenuStore.opened = opened ? this.uniqueId.toString() : null
 			},
 		},
+
+		isRenaming() {
+			return this.renamingStore.renamingNode === this.source
+		},
 	},
 
 	watch: {
@@ -208,6 +212,11 @@ export default defineComponent({
 		},
 
 		execDefaultAction(event) {
+			// Ignore click if we are renaming
+			if (this.isRenaming) {
+				return
+			}
+
 			// Ignore right click.
 			if (event.button > 1) {
 				return