diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
index 997e0cc6..7ab70a3f 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
@@ -118,7 +118,7 @@
                             {
                                 var connId = GetBindingConnectionId(attr.Name);
                                 var canBrowse = connId > 0;
-                                var isOpcUa = IsOpcUa(connId);
+                                var isBrowsable = IsBrowsable(connId);
                                 <tr>
                                     <td class="small">@attr.Name</td>
                                     <td class="small text-muted font-monospace">@attr.DataSourceReference</td>
@@ -140,7 +140,7 @@
                                                placeholder="@(attr.DataSourceReference ?? "(no default)")" />
                                     </td>
                                     <td>
-                                        @if (isOpcUa)
+                                        @if (isBrowsable)
                                         {
                                             <button class="btn btn-sm btn-outline-primary"
                                                     disabled="@(!canBrowse)"
@@ -566,13 +566,19 @@
     private string? GetTemplateDefault(string attrName)
         => _bindingDataSourceAttrs.FirstOrDefault(a => a.Name == attrName)?.DataSourceReference;
 
-    /// <summary>True when the row's selected data connection is OPC UA.</summary>
-    private bool IsOpcUa(int connectionId)
-        => connectionId > 0
-           && string.Equals(
-               _siteConnections.FirstOrDefault(c => c.Id == connectionId)?.Protocol,
-               "OpcUa",
-               StringComparison.OrdinalIgnoreCase);
+    /// <summary>
+    /// True when the row's selected data connection supports address-space browsing
+    /// (the tag picker). OPC UA and MxGateway both implement
+    /// <c>IBrowsableDataConnection</c> site-side; other protocols return a
+    /// NotBrowsable failure, so the button is hidden for them.
+    /// </summary>
+    private bool IsBrowsable(int connectionId)
+    {
+        if (connectionId <= 0) return false;
+        var protocol = _siteConnections.FirstOrDefault(c => c.Id == connectionId)?.Protocol;
+        return string.Equals(protocol, "OpcUa", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(protocol, "MxGateway", StringComparison.OrdinalIgnoreCase);
+    }
 
     /// <summary>
     /// Opens the OPC UA tag browser dialog for the given attribute row. Remembers