diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b8715bfa5b986fc09df445399e2ea78ca6ad4b93..0873e4f6ea370d0539af4524352cd173eafb2acf 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -938,6 +938,11 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		//	}
 		//}
 
+		// Mark the click as handled and return if we aren't within the root view to avoid spurious bugs
+		if( !mRootView->pointInView(x, y) )
+		{
+			return TRUE;
+		}
 		// Give the UI views a chance to process the click
 		if( mRootView->handleAnyMouseClick(x, y, mask, clicktype, down) )
 		{