diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index 45fa09e1a1c35cfcb17249d0e650306cb5fb02b1..fe6793ce7302ceb5fb5cfec1c13e3a8e48aab795 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -267,6 +267,13 @@ void LLHUDObject::updateAll()
 // static
 void LLHUDObject::renderAll()
 {
+    LLGLSUIDefault gls_ui;
+
+    gGL.color4f(1, 1, 1, 1);
+
+    gUIProgram.bind();
+    LLGLDepthTest depth(GL_FALSE, GL_FALSE);
+
 	LLHUDObject *hud_objp;
 	
 	hud_object_list_t::iterator object_it;
@@ -285,6 +292,7 @@ void LLHUDObject::renderAll()
 	}
 
 	LLVertexBuffer::unbind();
+    gUIProgram.unbind();
 }
 
 // static
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 189c60844b8bb328b6d943611bfec778ac004e97..a617bdb2cb80dae8c92b5fe8aa4559be8e42b039 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1420,9 +1420,8 @@ void render_ui(F32 zoom_factor, int subfield)
         if (render_ui)
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_UI("UI 2D"); //LL_RECORD_BLOCK_TIME(FTM_RENDER_UI_2D);
+            LLHUDObject::renderAll();
             render_ui_2d();
-            LLGLState::checkStates();
-            gGL.flush();
         }
 
         gViewerWindow->setup2DRender();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 93ae6e99a5224a11c3a89795cdce430dedba7c34..ef7ebda83415131025217546484f0affec02fe30 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4010,7 +4010,6 @@ void render_hud_elements()
     LL_PROFILE_ZONE_SCOPED_CATEGORY_UI; //LL_RECORD_BLOCK_TIME(FTM_RENDER_UI);
 	gPipeline.disableLights();
 	
-	LLGLDisable fog(GL_FOG);
 	LLGLSUIDefault gls_ui;
 
 	//LLGLEnable stencil(GL_STENCIL_TEST);
@@ -4038,9 +4037,6 @@ void render_hud_elements()
         }
 		LLViewerParcelMgr::getInstance()->render();
 		LLViewerParcelMgr::getInstance()->renderParcelCollision();
-	
-		// Render name tags.
-		LLHUDObject::renderAll();
 	}
 	else if (gForceRenderLandFence)
 	{
@@ -4053,7 +4049,6 @@ void render_hud_elements()
 	}
 
 	gUIProgram.unbind();
-	gGL.flush();
 }
 
 void LLPipeline::renderHighlights()