diff --git a/src/egl_context.c b/src/egl_context.c
index 7a14d734..452c0e46 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -262,8 +262,8 @@ int _glfwInitContextAPI(void)
         return GL_FALSE;
     }
 
-    if (_glfwPlatformExtensionSupported("EGL_KHR_create_context"))
-        _glfw.egl.KHR_create_context = GL_TRUE;
+    _glfw.egl.KHR_create_context =
+        _glfwPlatformExtensionSupported("EGL_KHR_create_context");
 
     return GL_TRUE;
 }
diff --git a/src/egl_context.h b/src/egl_context.h
index 4a1f343f..d1dbf220 100644
--- a/src/egl_context.h
+++ b/src/egl_context.h
@@ -89,12 +89,12 @@ typedef GLFWglproc (EGLAPIENTRY * PFNEGLGETPROCADDRESSPROC)(const char*);
 //
 typedef struct _GLFWcontextEGL
 {
-   EGLConfig      config;
-   EGLContext     context;
-   EGLSurface     surface;
+   EGLConfig        config;
+   EGLContext       context;
+   EGLSurface       surface;
 
 #if defined(_GLFW_X11)
-   XVisualInfo*   visual;
+   XVisualInfo*     visual;
 #endif
 
 } _GLFWcontextEGL;