diff --git a/frontend/src/dashboard.ts b/frontend/src/dashboard.ts
index f0af789..524e071 100644
--- a/frontend/src/dashboard.ts
+++ b/frontend/src/dashboard.ts
@@ -86,7 +86,7 @@ export class Dashboard {
           <footer class="home-footer"><span>EdgeSSH / Private workspace</span><span>首次保存时查询公网 IP 位置，失败时仍可连接。</span><a href="https://mappojs.com/" target="_blank" rel="noopener noreferrer">地图数据与灵感来自 Mappo.js</a></footer>
         </main>
       </div>
-      <dialog class="host-dialog" aria-labelledby="host-dialog-title">
+      <dialog id="host-editor-dialog" class="host-dialog" aria-labelledby="host-dialog-title">
         <form id="cloud-host-form" autocomplete="off">
           <div class="dialog-heading"><div><p class="home-eyebrow">ENCRYPTED HOST</p><h2 id="host-dialog-title">添加主机</h2></div><button type="button" class="home-button close-dialog" aria-label="关闭">×</button></div>
           <p class="dialog-intro">保存到你的云端主机库，不会写入浏览器本地存储。</p>
@@ -115,7 +115,7 @@ export class Dashboard {
     this.get('.home-layout').append(this.actions.files.root);
     this.get('.home-layout').append(this.actions.snippets.page);
     this.get('.home-layout').append(this.forwarding.root);
-    this.dialog = this.get<HTMLDialogElement>('.host-dialog');
+    this.dialog = this.get<HTMLDialogElement>('#host-editor-dialog');
     this.form = this.get<HTMLFormElement>('#cloud-host-form');
     this.get('#account-action').addEventListener('click', async (event) => {
       if (!this.authenticated) return;
diff --git a/tests/browser/dashboard.spec.ts b/tests/browser/dashboard.spec.ts
new file mode 100644
index 0000000..6b660df
--- /dev/null
+++ b/tests/browser/dashboard.spec.ts
@@ -0,0 +1,41 @@
+import { test, expect, type Page } from '@playwright/test';
+
+const host = {
+  id: 'alpha', name: 'Tokyo production', host: '192.0.2.10', port: 2222, username: 'deploy',
+  group: '生产环境', authMethod: 'publickey', initialCommand: 'tmux attach', termType: 'xterm-256color',
+  encoding: 'utf-8', fingerprint: `SHA256:${'A'.repeat(43)}`, location: null, system: null,
+  hasCredential: true, updatedAt: Date.now(),
+};
+
+async function dashboardFixture(page: Page) {
+  await page.route('**/api/**', async (route) => {
+    const path = new URL(route.request().url()).pathname;
+    if (path === '/api/auth/me') {
+      return route.fulfill({ json: { account: { username: 'Administrator' }, provider: 'cloudflare' } });
+    }
+    if (path === '/api/hosts') return route.fulfill({ json: { hosts: [host] } });
+    return route.fulfill({ json: {} });
+  });
+  await page.goto('/');
+}
+
+test('主机列表编辑打开正确弹窗并回填资料', async ({ page }) => {
+  await dashboardFixture(page);
+
+  await page.getByRole('button', { name: '编辑 Tokyo production' }).click();
+
+  const editor = page.getByRole('dialog', { name: '编辑主机' });
+  await expect(editor).toBeVisible();
+  await expect(editor.getByLabel('名称')).toHaveValue(host.name);
+  await expect(editor.getByLabel('主机地址')).toHaveValue(host.host);
+  await expect(editor.getByLabel('SSH 用户名')).toHaveValue(host.username);
+  await expect(editor.getByLabel('端口')).toHaveValue(String(host.port));
+  await expect(editor.locator('select[name="authMethod"]')).toHaveValue(host.authMethod);
+  await expect(editor.locator('textarea[name="privateKey"]')).toHaveValue('');
+  await expect(page.locator('dialog[aria-labelledby="forward-key-heading"]')).not.toHaveAttribute('open', '');
+
+  await editor.getByRole('button', { name: '取消' }).click();
+  await expect(editor).toBeHidden();
+  await page.getByRole('button', { name: '编辑 Tokyo production' }).click();
+  await expect(editor).toBeVisible();
+});