diff --git a/src/components/dialog/connections/SshAuthDialog.tsx b/src/components/dialog/connections/SshAuthDialog.tsx
index fe46cda7..d349cf5e 100644
--- a/src/components/dialog/connections/SshAuthDialog.tsx
+++ b/src/components/dialog/connections/SshAuthDialog.tsx
@@ -603,6 +603,7 @@ function SecretInput({
       <div className="relative mt-1">
         <Input
           ref={inputRef}
+          data-custom-password-reveal
           type={showValue ? "text" : "password"}
           value={value}
           onChange={(event) => onChange(event.target.value)}
diff --git a/src/components/dialog/docker/DockerSudoPasswordDialog.tsx b/src/components/dialog/docker/DockerSudoPasswordDialog.tsx
index 55230a5a..82f38a22 100644
--- a/src/components/dialog/docker/DockerSudoPasswordDialog.tsx
+++ b/src/components/dialog/docker/DockerSudoPasswordDialog.tsx
@@ -111,6 +111,7 @@ export default function DockerSudoPasswordDialog({
           <div className="relative">
             <Input
               ref={inputRef}
+              data-custom-password-reveal
               type={showPassword ? "text" : "password"}
               value={password}
               onChange={(event) => setPassword(event.target.value)}
diff --git a/src/components/dialog/security-auth/CredentialEditorDialog.tsx b/src/components/dialog/security-auth/CredentialEditorDialog.tsx
index 7f92a369..e605531c 100644
--- a/src/components/dialog/security-auth/CredentialEditorDialog.tsx
+++ b/src/components/dialog/security-auth/CredentialEditorDialog.tsx
@@ -174,6 +174,7 @@ export function CredentialEditorDialog({
                   </Label>
                   <div className="relative">
                     <Input
+                      data-custom-password-reveal
                       type={showPassword ? "text" : "password"}
                       placeholder={
                         passwordLoading
diff --git a/src/components/dialog/security-auth/KeyEditorDialog.tsx b/src/components/dialog/security-auth/KeyEditorDialog.tsx
index b770897e..aebc1cec 100644
--- a/src/components/dialog/security-auth/KeyEditorDialog.tsx
+++ b/src/components/dialog/security-auth/KeyEditorDialog.tsx
@@ -259,6 +259,7 @@ export function KeyEditorDialog({
             )}
             <div className="relative">
               <Input
+                data-custom-password-reveal
                 type={editShowPassphrase ? "text" : "password"}
                 placeholder={passphraseLoading ? t("common.loading") : t("settings.passphrase")}
                 className="h-8 pr-8 text-xs"
diff --git a/src/components/panel/security-auth/PasswordManagementTab.tsx b/src/components/panel/security-auth/PasswordManagementTab.tsx
index d764b0bd..718de15b 100644
--- a/src/components/panel/security-auth/PasswordManagementTab.tsx
+++ b/src/components/panel/security-auth/PasswordManagementTab.tsx
@@ -67,6 +67,7 @@ function PasswordEditor({
       />
       <div className="relative">
         <Input
+          data-custom-password-reveal
           type={showPassword ? "text" : "password"}
           placeholder={
             passwordLoading
diff --git a/src/components/sessions/RdpForm.tsx b/src/components/sessions/RdpForm.tsx
index b126d8b2..c0f71480 100644
--- a/src/components/sessions/RdpForm.tsx
+++ b/src/components/sessions/RdpForm.tsx
@@ -252,6 +252,7 @@ export function RdpForm({
             <div className="relative mt-1">
               <Input
                 className="h-8 pr-16 text-xs"
+                data-custom-password-reveal
                 type={showPassword ? "text" : "password"}
                 value={password}
                 placeholder={
diff --git a/src/components/sessions/SshForm.tsx b/src/components/sessions/SshForm.tsx
index bceb9f0d..0b9edf31 100644
--- a/src/components/sessions/SshForm.tsx
+++ b/src/components/sessions/SshForm.tsx
@@ -917,6 +917,7 @@ export function SshForm({
                 </Label>
                 <div className="relative mt-1">
                   <Input
+                    data-custom-password-reveal
                     type={showDirectPassword ? "text" : "password"}
                     className="text-xs h-8 pr-16"
                     placeholder={
diff --git a/src/components/sessions/TelnetForm.tsx b/src/components/sessions/TelnetForm.tsx
index 0c40418c..d47b9e6e 100644
--- a/src/components/sessions/TelnetForm.tsx
+++ b/src/components/sessions/TelnetForm.tsx
@@ -328,6 +328,7 @@ export function TelnetForm({
                 </Label>
                 <div className="relative mt-1">
                   <Input
+                    data-custom-password-reveal
                     type={showDirectPassword ? "text" : "password"}
                     className="text-xs h-8 pr-16"
                     placeholder={
diff --git a/src/components/sessions/VncForm.tsx b/src/components/sessions/VncForm.tsx
index 29a81625..9e933e4f 100644
--- a/src/components/sessions/VncForm.tsx
+++ b/src/components/sessions/VncForm.tsx
@@ -208,6 +208,7 @@ export function VncForm({
             <div className="relative mt-1">
               <Input
                 className="h-8 pr-16 text-xs"
+                data-custom-password-reveal
                 type={showPassword ? "text" : "password"}
                 value={password}
                 placeholder={
diff --git a/src/index.css b/src/index.css
index 8edc1590..a4539022 100644
--- a/src/index.css
+++ b/src/index.css
@@ -305,6 +305,12 @@ textarea,
   user-select: text;
 }
 
+/* Edge/WebView2 adds a native reveal button to password inputs. Hide it only
+   when NyaTerm renders its own password visibility control. */
+input[data-custom-password-reveal]::-ms-reveal {
+  display: none;
+}
+
 .nyaterm-wallpaper-shell[data-wallpaper-enabled="true"] .xterm,
 .nyaterm-wallpaper-shell[data-wallpaper-enabled="true"] .xterm .xterm-viewport,
 .nyaterm-wallpaper-shell[data-wallpaper-enabled="true"] .xterm .xterm-screen,