diff --git a/ext/src/ui/options/Bridge.svelte b/ext/src/ui/options/Bridge.svelte
index b67082f..b333afd 100644
--- a/ext/src/ui/options/Bridge.svelte
+++ b/ext/src/ui/options/Bridge.svelte
@@ -27,15 +27,13 @@
     let statusTitle: string;
     let statusText: Nullable<string> = null;
 
-    async function refreshBridgeStatus() {
+    async function updateBridgeStatus() {
         // Reset state
         bridgeInfo = null;
         bridgeInfoError = null;
         isLoadingInfo = true;
         statusText = null;
 
-        messaging.sendMessage({ subject: "main:refreshDeviceManager" });
-
         try {
             bridgeInfo = await bridge.getInfo();
         } catch (err) {
@@ -81,7 +79,7 @@
     }
 
     onMount(() => {
-        refreshBridgeStatus();
+        updateBridgeStatus();
     });
 
     // Updates
@@ -200,7 +198,14 @@
                     type="button"
                     class="ghost bridge__refresh"
                     title={_("optionsBridgeRefresh")}
-                    on:click={refreshBridgeStatus}
+                    on:click={() => {
+                        if (bridgeInfo && !bridgeInfoError) {
+                            messaging.sendMessage({
+                                subject: "main:refreshDeviceManager"
+                            });
+                        }
+                        updateBridgeStatus();
+                    }}
                 />
             </div>