diff --git a/Editor/UI/EditorWindows/Templates/SubdomainTemplate.cs b/Editor/UI/EditorWindows/Templates/SubdomainTemplate.cs
index f31135f2..2eea2251 100644
--- a/Editor/UI/EditorWindows/Templates/SubdomainTemplate.cs
+++ b/Editor/UI/EditorWindows/Templates/SubdomainTemplate.cs
@@ -68,7 +68,10 @@ private EventCallback<ChangeEvent<string>> SubdomainChanged(VisualElement errorI
                 errorIcon.visible = !IsValidSubdomain();
                 if (changeEvent.previousValue == partnerSubdomain) return;
                 subdomainField.SetValueWithoutNotify(partnerSubdomain);
-                subdomainField.Focus(); // forces text to resize, making new subdomain value visible
+                if (changeEvent.newValue != partnerSubdomain)
+                {
+                    subdomainField.Focus(); // forces text to resize, making new subdomain value visible
+                }
                 OnSubdomainChanged?.Invoke(partnerSubdomain);
             };
         }