diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 6fe3b8e8cc..b7f7aa9726 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1685,7 +1685,11 @@ void LLWindowWin32::showCursorFromMouseMove()
 
 void LLWindowWin32::hideCursorUntilMouseMove()
 {
-	if (!mHideCursorPermanent)
+	// <FS:Ansariel> Respect "Hide pointer while typing" Windows preference setting
+	//if (!mHideCursorPermanent)
+	BOOL mouse_manish = FALSE;
+	if (!mHideCursorPermanent && (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &mouse_manish, 0) || mouse_manish))
+	// </FS:Ansariel>
 	{
 		hideCursor();
 		mHideCursorPermanent = FALSE;