diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
index bf1c25c16dd9..563ff77658ef 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
@@ -104,9 +104,9 @@ context('Partial View Macro Files', () => {
       .withName(name)
       .withContent("@inherits Umbraco.Web.Macros.PartialViewMacroPage")
       .build();
-    
+
     cy.savePartialViewMacro(partialViewMacro);
-    
+
     // Navigate to settings
     cy.umbracoSection('settings');
     cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
@@ -133,7 +133,7 @@ context('Partial View Macro Files', () => {
       .withName(name)
       .withContent("@inherits Umbraco.Web.Macros.PartialViewMacroPage")
       .build();
-    
+
     cy.savePartialViewMacro(partialViewMacro);
 
     // Navigate to settings
@@ -142,7 +142,7 @@ context('Partial View Macro Files', () => {
     cy.umbracoTreeItem("settings", ["Partial View Macro Files", fullName]).click();
 
     // Type an edit
-    cy.get('.ace_content').type(" // test");
+    cy.get('.ace_text-input').type(" // test", {force:true} );
     // Save
     cy.get('.btn-success').click();
 
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
index 5fa4e151089d..068338f8fa14 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
@@ -107,11 +107,11 @@ context('Partial Views', () => {
         cy.umbracoContextMenuAction("action-delete").click();
         cy.umbracoButtonByLabelKey("general_ok").click();
 
-        // Assert 
+        // Assert
         cy.contains(fileName).should('not.exist');
         cy.umbracoPartialViewExists(fileName).then(exists => { expect(exists).to.be.false; });
 
-        // Clean 
+        // Clean
         cy.umbracoEnsurePartialViewNameNotExists(fileName);
     });
 
@@ -132,7 +132,7 @@ context('Partial Views', () => {
         // Open partial view
         cy.umbracoTreeItem("settings", ["Partial Views", fileName]).click();
         // Edit
-        cy.get('.ace_content').type("var num = 5;");
+        cy.get('.ace_text-input').type("var num = 5;", {force:true} );
         cy.get('.btn-success').click();
 
         // Assert
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index 194419ee8889..aff1c380935a 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -30,7 +30,7 @@ context('Templates', () => {
         /* Make an edit, if you don't the file will be create twice,
         only happens in testing though, probably because the test is too fast
         Certifiably mega wonk regardless */
-        cy.get('.ace_content').type("var num = 5;");
+        cy.get('.ace_text-input').type("var num = 5;", {force:true} );
 
         //Save
         cy.get('.btn-success').click();
@@ -59,10 +59,11 @@ context('Templates', () => {
         // Open partial view
         cy.umbracoTreeItem("settings", ["Templates", name]).click();
         // Edit
-        cy.get('.ace_content').type(edit);
+        cy.get('.ace_text-input').type(edit, {force:true} );
+
         // Navigate away
         cy.umbracoSection('content');
-        // Click stay button 
+        // Click stay button
         cy.get('umb-button[label="Stay"] button:enabled').click();
 
         // Assert
@@ -91,7 +92,8 @@ context('Templates', () => {
         // Open partial view
         cy.umbracoTreeItem("settings", ["Templates", name]).click();
         // Edit
-        cy.get('.ace_content').type(edit);
+        cy.get('.ace_text-input').type(edit, {force:true} );
+
         // Navigate away
         cy.umbracoSection('content');
         // Click discard