diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4bc91f635b..b84ed40e40 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1008,6 +1008,13 @@ void LLVOAvatarSelf::idleUpdate(LLAgent &agent, const F64 &time)
 	{
 		LLVOAvatar::idleUpdate(agent, time);
 		idleUpdateTractorBeam();
+
+		// <FS:Ansariel> Make sure to definitely stop typing
+		if ((gAgent.getTypingTime() > LLAgent::TYPING_TIMEOUT_SECS) && (gAgent.getRenderState() & AGENT_STATE_TYPING))
+		{
+			gAgent.stopTyping();
+		}
+		// </FS:Ansariel>
 	}
 }