diff --git a/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m b/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
index 0145f665..875de517 100644
--- a/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
+++ b/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
@@ -214,6 +214,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nDestro
 	[context_info->context performSelectorOnMainThread:@selector(clearDrawable) withObject:nil waitUntilDone:YES];
 	
 	if (context_info->peer_info->isWindowed) {
+		if (context_info->peer_info->window_info->view != nil) {
+			[context_info->peer_info->window_info->view setOpenGLContext:nil];
+		}
+		
 		[context_info->context release];
 		context_info->context = nil;
 		context_info->peer_info->window_info->context = nil;