diff --git a/src/Perspex.Controls/Control.cs b/src/Perspex.Controls/Control.cs
index d6f3cd9d2e..fe97dc072e 100644
--- a/src/Perspex.Controls/Control.cs
+++ b/src/Perspex.Controls/Control.cs
@@ -154,7 +154,7 @@ namespace Perspex.Controls
                     throw new InvalidOperationException("Cannot set Name to empty string.");
                 }
 
-                if (VisualRoot != null)
+                if (_isAttachedToLogicalTree)
                 {
                     throw new InvalidOperationException("Cannot set Name : control already added to tree.");
                 }