diff --git a/ClassicalSharp/Game/InputHandler.cs b/ClassicalSharp/Game/InputHandler.cs
index 2d803016f..c240b640d 100644
--- a/ClassicalSharp/Game/InputHandler.cs
+++ b/ClassicalSharp/Game/InputHandler.cs
@@ -20,7 +20,7 @@ namespace ClassicalSharp {
 			Keys = new KeyMap();
 			Hotkeys = new HotkeyList();
 			Hotkeys.LoadSavedHotkeys();
-			picking = new PickingHandler( game );
+			picking = new PickingHandler( game, this );
 		}
 		
 		void RegisterInputHandlers() {
diff --git a/ClassicalSharp/Game/PickingHandler.cs b/ClassicalSharp/Game/PickingHandler.cs
index 0ccedf42a..ece4cd974 100644
--- a/ClassicalSharp/Game/PickingHandler.cs
+++ b/ClassicalSharp/Game/PickingHandler.cs
@@ -10,9 +10,9 @@ namespace ClassicalSharp {
 		
 		Game game;
 		InputHandler input;
-		public PickingHandler( Game game ) {
+		public PickingHandler( Game game, InputHandler input ) {
 			this.game = game;
-			input = game.InputHandler;
+			this.input = input;
 		}		
 
 		internal DateTime lastClick = DateTime.MinValue;