diff --git a/vtm-gdx/src/org/oscim/gdx/GdxMap.java b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
index 9564b232..fcb62818 100644
--- a/vtm-gdx/src/org/oscim/gdx/GdxMap.java
+++ b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
@@ -82,7 +82,7 @@ public abstract class GdxMap implements ApplicationListener {
 		mMapRenderer.onSurfaceChanged(w, h);
 
 		InputMultiplexer mux = new InputMultiplexer();
-		mux.addProcessor(new InputHandler(mMap));
+		mux.addProcessor(new InputHandler(this));
 		//mux.addProcessor(new GestureDetector(20, 0.5f, 2, 0.05f,
 		//                                     new MapController(mMap)));
 		mux.addProcessor(new MotionHandler(mMap));
diff --git a/vtm-gdx/src/org/oscim/gdx/InputHandler.java b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
index 2af30570..ba299ec0 100644
--- a/vtm-gdx/src/org/oscim/gdx/InputHandler.java
+++ b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
@@ -16,10 +16,12 @@ public class InputHandler implements InputProcessor {
 	private ViewController mViewport;
 	private final Map mMap;
 	private GenericLayer mGridLayer;
+	private final GdxMap mGdxApp;
 
-	public InputHandler(Map map) {
-		mViewport = map.viewport();
-		mMap = map;
+	public InputHandler(GdxMap map) {
+		mMap = map.getMap();
+		mViewport = mMap.viewport();
+		mGdxApp = map;
 	}
 
 	private boolean mActiveScale;
@@ -30,8 +32,8 @@ public class InputHandler implements InputProcessor {
 
 	@Override
 	public boolean keyDown(int keycode) {
-		//if (onKeyDown(keycode))
-		//	return true;
+		if (mGdxApp.onKeyDown(keycode))
+			return true;
 
 		switch (keycode) {
 			case Input.Keys.ESCAPE: