diff --git a/src/java/org/lwjgl/opengl/AWTGLCanvas.java b/src/java/org/lwjgl/opengl/AWTGLCanvas.java
index 4e27ebe4..17b510e9 100644
--- a/src/java/org/lwjgl/opengl/AWTGLCanvas.java
+++ b/src/java/org/lwjgl/opengl/AWTGLCanvas.java
@@ -270,13 +270,16 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
 					context.makeCurrent();
 					initGL();
 				}
-				if (!context.isCurrent())
-					context.makeCurrent();
-				if (update_context) {
-					context.update();
-					update_context = false;
+				context.makeCurrent();
+				try {
+					if (update_context) {
+						context.update();
+						update_context = false;
+					}
+					paintGL();
+				} finally {
+					Context.releaseCurrentContext();
 				}
-				paintGL();
 			} finally {
 				peer_info.unlock();
 			}