diff --git a/browser_tests/tests/vueNodes/maskEditor.spec.ts b/browser_tests/tests/vueNodes/maskEditor.spec.ts
index 04a526258..ce2d33f97 100644
--- a/browser_tests/tests/vueNodes/maskEditor.spec.ts
+++ b/browser_tests/tests/vueNodes/maskEditor.spec.ts
@@ -25,7 +25,9 @@ test.describe('Vue Nodes Mask Editor', () => {
       waitForUpload: true
     })
 
-    await comfyPage.page.waitForTimeout(500)
+    // Wait for image preview to appear
+    const imagePreview = comfyPage.page.locator('.image-preview img')
+    await expect(imagePreview).toBeVisible()
 
     const maskEditorDialog = comfyPage.page.locator('.maskEditor-dialog-root')
 
@@ -33,9 +35,9 @@ test.describe('Vue Nodes Mask Editor', () => {
     await comfyPage.selectNodes(['Load Image'])
     await expect(comfyPage.selectionToolbox).toBeVisible()
 
-    const toolboxMaskButton = comfyPage.page.locator(
-      '.selection-toolbox button:has(.i-comfy\\:mask)'
-    )
+    const toolboxMaskButton = comfyPage.selectionToolbox.getByRole('button', {
+      name: /mask editor/i
+    })
     await expect(toolboxMaskButton).toBeVisible()
     await toolboxMaskButton.click()
 
diff --git a/src/components/graph/selectionToolbox/MaskEditorButton.vue b/src/components/graph/selectionToolbox/MaskEditorButton.vue
index cf7148356..8228e7746 100644
--- a/src/components/graph/selectionToolbox/MaskEditorButton.vue
+++ b/src/components/graph/selectionToolbox/MaskEditorButton.vue
@@ -5,6 +5,7 @@
       value: $t('commands.Comfy_MaskEditor_OpenMaskEditor.label'),
       showDelay: 1000
     }"
+    :aria-label="$t('commands.Comfy_MaskEditor_OpenMaskEditor.label')"
     severity="secondary"
     text
     @click="openMaskEditor"
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts
index 6cb4b1058..2ec7bfb32 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts
+++ b/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts
@@ -1,6 +1,6 @@
 import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
 
@@ -58,6 +58,11 @@ describe('ImagePreview', () => {
     ]
   }
 
+  beforeEach(() => {
+    delete mockNode.imgs
+    delete mockNode.imageIndex
+  })
+
   const mountImagePreview = (props = {}) => {
     return mount(ImagePreview, {
       props: { ...defaultProps, ...props },
@@ -315,10 +320,6 @@ describe('ImagePreview', () => {
   })
 
   it('syncs node.imgs on image load for legacy compatibility', async () => {
-    // Reset mock node state
-    delete mockNode.imgs
-    delete mockNode.imageIndex
-
     const wrapper = mountImagePreview({
       imageUrls: [defaultProps.imageUrls[0]],
       nodeId: 'test-node-123'
@@ -327,13 +328,11 @@ describe('ImagePreview', () => {
     const img = wrapper.find('img')
     expect(img.exists()).toBe(true)
 
-    // Simulate image load event
     await img.trigger('load')
     await nextTick()
 
-    // Verify node.imgs was synced
-    expect(mockNode.imgs).toBeDefined()
     expect(mockNode.imgs).toHaveLength(1)
+    expect(mockNode.imgs?.[0]).toBe(img.element)
     expect(mockNode.imageIndex).toBe(0)
   })
 })