diff --git a/gfx/drivers/gl_capabilities.c b/gfx/drivers/gl_capabilities.c
index 4e8d86aad3..327f3ec3eb 100644
--- a/gfx/drivers/gl_capabilities.c
+++ b/gfx/drivers/gl_capabilities.c
@@ -117,6 +117,12 @@ bool gl_check_capability(enum gl_capability_enum enum_idx)
 
    switch (enum_idx)
    {
+      case GL_CAPS_GLES3_SUPPORTED:
+#if defined(HAVE_OPENGLES)
+         if (major >= 3)
+            return true;
+#endif
+         break;
       case GL_CAPS_EGLIMAGE:
 #if defined(HAVE_EGL) && defined(HAVE_OPENGLES)
          if (glEGLImageTargetTexture2DOES != NULL)
diff --git a/gfx/drivers/gl_capabilities.h b/gfx/drivers/gl_capabilities.h
index e6bffe6aa6..1ea4e3ce09 100644
--- a/gfx/drivers/gl_capabilities.h
+++ b/gfx/drivers/gl_capabilities.h
@@ -197,7 +197,8 @@ enum gl_capability_enum
    GL_CAPS_SRGB_FBO,
    GL_CAPS_SRGB_FBO_ES3,
    GL_CAPS_FP_FBO,
-   GL_CAPS_BGRA8888
+   GL_CAPS_BGRA8888,
+   GL_CAPS_GLES3_SUPPORTED
 };
 
 RETRO_BEGIN_DECLS
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index 0ef3d6f846..cf0777c21e 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -372,7 +372,7 @@ static void *gfx_ctx_x_init(void *data)
    {
       case GFX_CTX_OPENGL_API:
       case GFX_CTX_OPENGL_ES_API:
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
          glXQueryVersion(g_x11_dpy, &major, &minor);
 
          /* GLX 1.3+ minimum required. */