diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 198e7024593af28e5b0fcf1ec7623cfdcb371eaf..bb85551205fe38a1361097f6a0c873c1f3fa1688 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -367,7 +367,7 @@ NVIDIA GTX 550					.*NVIDIA .*GTX *55.*						3		1
 NVIDIA GTX 560					.*NVIDIA .*GTX *56.*						3		1
 NVIDIA GTX 570					.*NVIDIA .*GTX *57.*						3		1
 NVIDIA GTX 580M					.*NVIDIA .*GTX *580M.*						3		1
-NVIDIA GTX 580					.*NVIDIA .*GTX *58.*						3		1
+NVIDIA GTX 580					.*NVIDIA .*GTX *58.*						3		0
 NVIDIA GTX 590					.*NVIDIA .*GTX *59.*						3		1
 NVIDIA C51						.*NVIDIA .*C51.*							0		1
 NVIDIA G72						.*NVIDIA .*G72.*							1		1
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index eb0cdf28c0e39aaab2b8e4e5bddc64ee2e970320..08f9d267054cffb2662bd7a810e06bd2b59157b9 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -731,7 +731,7 @@ void LLFeatureManager::applyBaseMasks()
 	{
 		maskFeatures("NoPixelShaders");
 	}
-	if (!gGLManager.mHasVertexShader)
+	if (!gGLManager.mHasVertexShader || !mGPUSupported)
 	{
 		maskFeatures("NoVertexShaders");
 	}