diff --git a/src/java/org/lwjgl/opengl/MacOSXFrame.java b/src/java/org/lwjgl/opengl/MacOSXFrame.java
index 8ccbfd73..e3c21f23 100644
--- a/src/java/org/lwjgl/opengl/MacOSXFrame.java
+++ b/src/java/org/lwjgl/opengl/MacOSXFrame.java
@@ -246,7 +246,11 @@ final class MacOSXFrame extends Frame implements WindowListener, ComponentListen
 
 	private void invokeAWT(Runnable r) {
 		try {
-			java.awt.EventQueue.invokeAndWait(r);
+			if (java.awt.EventQueue.isDispatchThread()) {
+				r.run();
+			} else {
+				java.awt.EventQueue.invokeAndWait(r);
+			}
 		} catch (InterruptedException e) {
 			// ignore
 		} catch (InvocationTargetException e) {