--- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-01-13 11:26:27.000000000 -0800
+++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	2016-01-13 11:26:27.000000000 -0800
@@ -179,6 +179,10 @@
     }
 
     public ES2Graphics createGraphics() {
+        if (drawable.getNativeWindow() != pState.getNativeWindow()) {
+            drawable = ES2Pipeline.glFactory.createGLDrawable(
+                    pState.getNativeWindow(), context.getPixelFormat());
+        }
         context.makeCurrent(drawable);
 
         nativeDestHandle = pState.getNativeFrameBuffer();