diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index a37de468b3a957b53c984fe0b08beb3fa96ebbca..0dc1a88ee8912ffe0b8dd8e623e2302a235f878f 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7908,6 +7908,7 @@ void LLPipeline::generateHighlight(LLCamera& camera)
 
 		mHighlight.flush();
 		gGL.setColorMask(true, false);
+		gViewerWindow->setup3DViewport();
 	}
 }