diff --git a/src/Avalonia.OpenGL/EglDisplay.cs b/src/Avalonia.OpenGL/EglDisplay.cs
index f93bf7280c..8a81b2b584 100644
--- a/src/Avalonia.OpenGL/EglDisplay.cs
+++ b/src/Avalonia.OpenGL/EglDisplay.cs
@@ -121,9 +121,11 @@ namespace Avalonia.OpenGL
                     _contextAttributes = cfg.Attributes;
                     _surfaceType = surfaceType;
                     Type = cfg.Type;
+                    goto Found;
                 }
-            }
 
+            }
+            Found:
             if (_contextAttributes == null)
                 throw new OpenGlException("No suitable EGL config was found");
                
@@ -155,7 +157,6 @@ namespace Avalonia.OpenGL
             if (surf == IntPtr.Zero)
                 throw OpenGlException.GetFormattedException("eglCreatePBufferSurface", _egl);
             var rv = new EglContext(this, _egl, ctx, new EglSurface(this, _egl, surf));
-            rv.MakeCurrent(null);
             return rv;
         }