diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.js b/lnbits/extensions/watchonly/static/components/payment/payment.js
index e2a59207..dfe61447 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.js
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.js
@@ -84,7 +84,6 @@ async function payment(path) {
         try {
           if (!this.serialSignerRef.isConnected()) {
             await this.serialSignerRef.openSerialPort()
-            return
           }
           if (!this.serialSignerRef.isAuthenticated()) {
             await this.serialSignerRef.hwwShowPasswordDialog()
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 ec23a9e2..66d01d0a 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
@@ -5,7 +5,7 @@
     color="primary"
     icon="usb"
     :text-color="selectedPort ? hww.authenticated ? 'green' : 'orange' : 'white'"
-    @click="toggleSerialPortConection"
+    @click="openSerialPort"
   >
     <q-list>
       <q-item v-if="!selectedPort" clickable v-close-popup>
@@ -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="openSerialPort()"
+      >
+        <q-item-section>
+          <q-item-label>Connect</q-item-label>
+          <q-item-label caption>Connect Serial Port device.</q-item-label>
+        </q-item-section>
+      </q-item>
       <q-item
         v-if="selectedPort"
         clickable
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 6e5c96fd..72f39daf 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -36,13 +36,9 @@ async function serialSigner(path) {
     },
 
     methods: {
-      toggleSerialPortConection: async function () {
-        if (!this.selectedPort) {
-          this.openSerialPort()
-        }
-      },
       openSerialPort: async function () {
         if (!this.checkSerialPortSupported()) return
+        if (this.selectedPort) return
         console.log('### openSerialPort', this.selectedPort)
         try {
           navigator.serial.addEventListener('connect', event => {
diff --git a/lnbits/extensions/watchonly/static/components/wallet-config/wallet-config.js b/lnbits/extensions/watchonly/static/components/wallet-config/wallet-config.js
index 3bd3fbf7..45ea1dab 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-config/wallet-config.js
+++ b/lnbits/extensions/watchonly/static/components/wallet-config/wallet-config.js
@@ -14,7 +14,6 @@ async function walletConfig(path) {
         return satOrBtc(val, showUnit, this.config.data.sats_denominated)
       },
       updateConfig: async function () {
-        // const wallet = this.g.user.wallets[0]
         try {
           await LNbits.api.request(
             'PUT',