diff --git a/cypress/e2e/conflict.spec.js b/cypress/e2e/conflict.spec.js
index b4c7aa47f8..fc5e81f660 100644
--- a/cypress/e2e/conflict.spec.js
+++ b/cypress/e2e/conflict.spec.js
@@ -116,6 +116,7 @@ function createConflict(fileName, mime) {
 	cy.visit('/apps/files')
 	cy.openFile(fileName)
 	cy.log('Inspect editor')
+	cy.getEditor().find('.ProseMirror').should('have.attr', 'contenteditable', 'true')
 	cy.getContent()
 		.type('Hello you cruel conflicting world')
 	cy.uploadFile(fileName, mime)