diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
index 61c72bc3e..251c6138e 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
@@ -18,12 +18,12 @@
       </q-item>
 
       <q-item
-        v-if="!hww.authenticated"
+        v-if="selectedPort && !hww.authenticated"
         clickable
         v-close-popup
         @click="hwwShowPasswordDialog()"
       >
-        <q-item-section v-if="selectedPort">
+        <q-item-section>
           <q-item-label>Login</q-item-label>
           <q-item-label caption
             >Enter password for Hardware Wallet.</q-item-label
@@ -42,6 +42,17 @@
           <q-item-label caption>Clear password for HWW.</q-item-label>
         </q-item-section>
       </q-item>
+      <q-item
+        v-if="selectedPort"
+        clickable
+        v-close-popup
+        @click="closeSerialPort()"
+      >
+        <q-item-section>
+          <q-item-label>Disconnect</q-item-label>
+          <q-item-label caption>Disconnect from Serial Port.</q-item-label>
+        </q-item-section>
+      </q-item>
 
       <q-item
         v-if="selectedPort"
diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index fc05cf69f..c0c4cf2b3 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -37,8 +37,6 @@ async function serialSigner(path) {
       toggleSerialPortConection: async function () {
         if (!this.selectedPort) {
           this.openSerialPort()
-        } else {
-          this.closeSerialPort()
         }
       },
       openSerialPort: async function () {
@@ -104,6 +102,8 @@ async function serialSigner(path) {
             caption: `${error}`,
             timeout: 10000
           })
+        } finally {
+          this.hww.authenticated = false
         }
       },