1 files changed, 5 insertions, 6 deletions
diff --git a/remote/marionette/interaction.sys.mjs b/remote/marionette/interaction.sys.mjs
index d710f2eb46..7fa7df0abe 100644
--- a/remote/marionette/interaction.sys.mjs
+++ b/remote/marionette/interaction.sys.mjs
@@ -9,7 +9,8 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 
-  accessibility: "chrome://remote/content/marionette/accessibility.sys.mjs",
+  accessibility:
+    "chrome://remote/content/shared/webdriver/Accessibility.sys.mjs",
   atom: "chrome://remote/content/marionette/atom.sys.mjs",
   dom: "chrome://remote/content/shared/DOM.sys.mjs",
   error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
@@ -236,9 +237,7 @@ async function webdriverClickElement(el, a11y) {
 }
 
 async function chromeClick(el, a11y) {
-  const win = getWindow(el);
-
-  if (!(await lazy.atom.isElementEnabled(el, win))) {
+  if (!(await lazy.dom.isEnabled(el))) {
     throw new lazy.error.InvalidElementStateError("Element is not enabled");
   }
 
@@ -266,7 +265,7 @@ async function seleniumClickElement(el, a11y) {
     throw new lazy.error.ElementNotInteractableError();
   }
 
-  if (!(await lazy.atom.isElementEnabled(el, win))) {
+  if (!(await lazy.dom.isEnabled(el))) {
     throw new lazy.error.InvalidElementStateError("Element is not enabled");
   }
 
@@ -775,7 +774,7 @@ interaction.isElementEnabled = async function (el, strict = false) {
   ) {
     enabled = false;
   } else {
-    enabled = await lazy.atom.isElementEnabled(el, win);
+    enabled = await lazy.dom.isEnabled(el);
   }
 
   let a11y = lazy.accessibility.get(strict);