diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index cbb50d7751..4f89dd0822 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1453,9 +1453,15 @@ namespace OpenSim.Region.Environment.Scenes
         {
             LLQuaternion lRot;
             lRot = RotationOffset;
+            clientFlags &= ~(uint)LLObject.ObjectFlags.CreateSelected;
+
             if (remoteClient.AgentId == OwnerID) 
             {
-                clientFlags &= ~(uint)LLObject.ObjectFlags.CreateSelected;
+                if ((uint)(m_flags & LLObject.ObjectFlags.CreateSelected) != 0)
+                {
+                    clientFlags |= (uint)LLObject.ObjectFlags.CreateSelected;
+                    m_flags &= ~LLObject.ObjectFlags.CreateSelected;
+                }
             }