diff --git a/src/com/limelight/Limelight.java b/src/com/limelight/Limelight.java
index d5bb890..639c137 100644
--- a/src/com/limelight/Limelight.java
+++ b/src/com/limelight/Limelight.java
@@ -128,8 +128,8 @@ public class Limelight implements NvConnectionListener {
 
 		createFrame();
 		
-		NativeGamepad.start();
 		NativeGamepad.addListener(GamepadListener.getInstance());
+		NativeGamepad.start();
 	}
 	
 	public void stop() {