diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java
index 3239c5b4..e9edaf87 100644
--- a/src/java/org/lwjgl/opengl/Display.java
+++ b/src/java/org/lwjgl/opengl/Display.java
@@ -277,8 +277,8 @@ public final class Display {
 		}
 		try {
 			if (context != null && context.isCurrent()) {
-				context.releaseDrawable();
 				Context.releaseCurrentContext();
+				context.releaseDrawable();
 			}
 		} catch (LWJGLException e) {
 			LWJGLUtil.log("Exception occurred while trying to release context: " + e);