diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index c87f2016e4..0b9a7c091b 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -811,8 +811,11 @@ void FloaterQuickPrefs::refreshSettings()
 	sky_spinner->setEnabled(TRUE);
 	sky_default_button->setEnabled(TRUE);
 
+	BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump");
+	BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders");
 	BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
-						gSavedSettings.getBOOL("RenderObjectBump") &&
+						bumpshiny &&
+						shaders &&
 						gGLManager.mHasFramebufferObject &&
 						gSavedSettings.getBOOL("RenderAvatarVP") &&
 						(mCtrlWindLight->get()) ? TRUE : FALSE;