diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index f000e56..9766103 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -269,7 +269,8 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
         if (glxConvertToXVisualType(config->visualType) != visual->class)
             continue;
         /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
-        if (visual->nplanes == 32 && config->rgbBits != 32)
+        if (visual->nplanes == 32 && (config->rgbBits != 32 ||
+                                      config->sRGBCapable))
             continue;
         /* Can't use the same FBconfig for multiple X visuals.  I think. */
         if (config->visualID != 0)