diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c5f10d38d0..7da93f6b29 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4443,6 +4443,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	}
 	// </FS:Ansariel>
 
+	// <FS:Ansariel> Stop typing after teleport (possible fix for FIRE-7273)
+	gAgent.stopTyping();
+
 	// Now do teleport effect for where you're going.
 	// VEFFECT: TeleportEnd
 	effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
@@ -7359,6 +7362,9 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 		gAgent.setFlying(FALSE);
 	}
 
+	// <FS:Ansariel> Stop typing after teleport (possible fix for FIRE-7273)
+	gAgent.stopTyping();
+
 	gAgent.setPositionAgent(pos);
 	gAgentCamera.slamLookAt(look_at);