diff --git a/src/java/org/lwjgl/opengl/AWTGLCanvas.java b/src/java/org/lwjgl/opengl/AWTGLCanvas.java
index 264d4002..d454b702 100644
--- a/src/java/org/lwjgl/opengl/AWTGLCanvas.java
+++ b/src/java/org/lwjgl/opengl/AWTGLCanvas.java
@@ -65,7 +65,6 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
 		if (OS_NAME.startsWith("Linux")) {
 			class_name = "org.lwjgl.opengl.LinuxCanvasImplementation";
 		} else if (OS_NAME.startsWith("Windows")) {
-			System.loadLibrary("jawt");
 			class_name = "org.lwjgl.opengl.Win32CanvasImplementation";
 		} else if (OS_NAME.startsWith("Mac")) {
 			class_name = "org.lwjgl.opengl.MacOSXCanvasImplementation";
diff --git a/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java b/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
index 75790253..d70c924c 100644
--- a/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
+++ b/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
@@ -49,6 +49,10 @@ import java.lang.reflect.Method;
  * @version $Revision$
  */
 final class Win32CanvasImplementation implements AWTCanvasImplementation {
+	static {
+		System.loadLibrary("jawt");
+	}
+
 	public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {
 		return new Win32AWTGLCanvasPeerInfo(canvas, pixel_format);
 	}