diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 4f7511294d..6efed98fff 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -654,7 +654,8 @@ bool LLToolPie::teleportToClickedLocation()
     LLViewerObject* objp = mHoverPick.getObject();
     LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
 
-    if (objp->getAvatar() == gAgentAvatarp)
+    if (objp->getAvatar() == gAgentAvatarp
+        || objp == gAgentAvatarp) // ex: nametag
     {
         // Don't teleport to self, teleporting to other avatars is fine
         return false;