diff --git a/src/egl_context.c b/src/egl_context.c
index 517c64cb..232dddb8 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -868,7 +868,13 @@ GLFWbool _glfwChooseVisualEGL(const _GLFWwndconfig* wndconfig,
     XVisualInfo desired;
     EGLConfig native;
     EGLint visualID = 0, count = 0;
-    const long vimask = VisualScreenMask | VisualIDMask;
+    long vimask;
+
+    if (fbconfig->transparent) {
+        vimask = VisualScreenMask;
+    } else {
+        vimask = VisualScreenMask | VisualIDMask;
+    }
 
     if (!chooseEGLConfig(ctxconfig, fbconfig, &native))
         return GLFW_FALSE;
@@ -887,6 +893,21 @@ GLFWbool _glfwChooseVisualEGL(const _GLFWwndconfig* wndconfig,
         return GLFW_FALSE;
     }
 
+    if (fbconfig->transparent) {
+        int i;
+        for (i = 0; i < count; i++) {
+            XVisualInfo *vinfo = &result[i];
+            if (vinfo->class == DirectColor || vinfo->class == TrueColor) {
+                if (vinfo->depth == 32) {
+                    *visual = vinfo->visual;
+                    *depth = vinfo->depth;
+                    XFree(result);
+                    return GLFW_TRUE;
+                }
+            }
+        }
+    }
+
     *visual = result->visual;
     *depth = result->depth;