diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 85f490bc366b..a160094a5413 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -78,6 +78,7 @@
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
+/x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
 
 # Observability UIs
 /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
diff --git a/x-pack/test/functional/page_objects/canvas_page.ts b/x-pack/test/functional/page_objects/canvas_page.ts
index ce36385a2f9d..f08d1e6b7fef 100644
--- a/x-pack/test/functional/page_objects/canvas_page.ts
+++ b/x-pack/test/functional/page_objects/canvas_page.ts
@@ -33,8 +33,12 @@ export function CanvasPageProvider({ getService }: FtrProviderContext) {
 
     async fillOutCustomElementForm(name: string, description: string) {
       // Fill out the custom element form and submit it
-      await testSubjects.setValue('canvasCustomElementForm-name', name);
-      await testSubjects.setValue('canvasCustomElementForm-description', description);
+      await testSubjects.setValue('canvasCustomElementForm-name', name, {
+        clearWithKeyboard: true,
+      });
+      await testSubjects.setValue('canvasCustomElementForm-description', description, {
+        clearWithKeyboard: true,
+      });
 
       await testSubjects.click('canvasCustomElementForm-submit');
     },