diff --git a/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m b/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
index dcdde4eb..0145f665 100644
--- a/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
+++ b/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
@@ -216,6 +216,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nDestro
 	if (context_info->peer_info->isWindowed) {
 		[context_info->context release];
 		context_info->context = nil;
+		context_info->peer_info->window_info->context = nil;
 	}
 	
 	[pool release];