diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ef3031642..fad3f8229 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3920,6 +3920,7 @@ void handle_object_sit_or_stand()
 
 	if (sitting_on_selection())
 	{
+		LLAgent::stopAutoPilot(true);
 		gAgent.standUp();
 		return;
 	}