diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java
index 5e2dde1d..b4bae93d 100644
--- a/src/java/org/lwjgl/opengl/LinuxDisplay.java
+++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java
@@ -389,11 +389,16 @@ final class LinuxDisplay implements DisplayImplementation {
 	}
 
 	private static DisplayMode getCurrentXRandrMode() throws LWJGLException {
-		incDisplay();
+		lockAWT();
 		try {
-			return nGetCurrentXRandrMode();
+			incDisplay();
+			try {
+				return nGetCurrentXRandrMode();
+			} finally {
+				decDisplay();
+			}
 		} finally {
-			decDisplay();
+			unlockAWT();
 		}
 	}