diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Uns/EquipmentPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Uns/EquipmentPage.razor
index 96236d97..fc0a46ff 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Uns/EquipmentPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Uns/EquipmentPage.razor
@@ -415,9 +415,10 @@ else
     // --- Alias-tag handlers (mirror the tag handlers; aliases live in the same _tags list + delete the
     // same way, so only the create/edit modal differs — it embeds the Galaxy live-browse picker). ---
 
-    private void OpenAddAlias()
+    private async Task OpenAddAlias()
     {
         _tagError = null;
+        _gateways = await Svc.LoadGalaxyGatewaysForEquipmentAsync(EquipmentId!);
         _aliasModalIsNew = true;
         _aliasModalExisting = null;
         _aliasModalVisible = true;
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/AliasTagModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/AliasTagModal.razor
index 431ed521..d6b3bc9f 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/AliasTagModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/AliasTagModal.razor
@@ -82,14 +82,17 @@
                             <ValidationMessage For="@(() => _form.FullName)" />
                         </div>
 
-                        <DriverTagPicker @bind-Visible="_showPicker"
-                                         Title="Galaxy address"
-                                         CurrentAddress="@_form.FullName"
-                                         OnPickAddress="@OnAddressPicked">
-                            <GalaxyAddressPickerBody CurrentAddress="@_form.FullName"
-                                                     CurrentAddressChanged="@((s) => _form.FullName = s)"
-                                                     GetConfigJson="@(() => _selectedGatewayConfig)" />
-                        </DriverTagPicker>
+                        @if (_showPicker)
+                        {
+                            <DriverTagPicker @bind-Visible="_showPicker"
+                                             Title="Galaxy address"
+                                             CurrentAddress="@_form.FullName"
+                                             OnPickAddress="@OnAddressPicked">
+                                <GalaxyAddressPickerBody CurrentAddress="@_form.FullName"
+                                                         CurrentAddressChanged="@((s) => _form.FullName = s)"
+                                                         GetConfigJson="@(() => _selectedGatewayConfig)" />
+                            </DriverTagPicker>
+                        }
 
                         @if (!string.IsNullOrWhiteSpace(_error))
                         {