diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index 9d1983190c..cb767bd2a4 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -61,8 +61,16 @@ void cInterfaceEGL::DetectMode()
   {
     // attributes for a visual in RGBA format with at least
     // 8 bits per color
-    int attribs[] = {EGL_RED_SIZE,  8, EGL_GREEN_SIZE,      8,
-                     EGL_BLUE_SIZE, 8, EGL_RENDERABLE_TYPE, renderable_type,
+    int attribs[] = {EGL_RED_SIZE,
+                     8,
+                     EGL_GREEN_SIZE,
+                     8,
+                     EGL_BLUE_SIZE,
+                     8,
+                     EGL_RENDERABLE_TYPE,
+                     renderable_type,
+                     EGL_SURFACE_TYPE,
+                     m_has_handle ? EGL_WINDOW_BIT : 0,
                      EGL_NONE};
 
     // Get how many configs there are
@@ -180,6 +188,8 @@ bool cInterfaceEGL::Create(void* window_handle, bool stereo, bool core)
                    8,
                    EGL_BLUE_SIZE,
                    8,
+                   EGL_SURFACE_TYPE,
+                   m_has_handle ? EGL_WINDOW_BIT : 0,
                    EGL_NONE};
 
   std::vector<EGLint> ctx_attribs;