diff --git a/web/jest.setup.ts b/web/jest.setup.ts
index 383ba412a2..006b28322e 100644
--- a/web/jest.setup.ts
+++ b/web/jest.setup.ts
@@ -2,16 +2,22 @@ import '@testing-library/jest-dom'
 import { cleanup } from '@testing-library/react'
 
 // Fix for @headlessui/react compatibility with happy-dom
-// headlessui tries to set focus property which is read-only in happy-dom
+// headlessui tries to override focus properties which may be read-only in happy-dom
 if (typeof window !== 'undefined') {
-  // Ensure window.focus is writable for headlessui
-  if (!Object.getOwnPropertyDescriptor(window, 'focus')?.writable) {
-    Object.defineProperty(window, 'focus', {
-      value: jest.fn(),
-      writable: true,
-      configurable: true,
-    })
+  const ensureWritable = (target: object, prop: string) => {
+    const descriptor = Object.getOwnPropertyDescriptor(target, prop)
+    if (descriptor && !descriptor.writable) {
+      const original = descriptor.value ?? descriptor.get?.call(target)
+      Object.defineProperty(target, prop, {
+        value: typeof original === 'function' ? original : jest.fn(),
+        writable: true,
+        configurable: true,
+      })
+    }
   }
+
+  ensureWritable(window, 'focus')
+  ensureWritable(HTMLElement.prototype, 'focus')
 }
 
 afterEach(() => {