diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java
index 33ce52296b..846ac975ab 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java
@@ -94,6 +94,12 @@ public class MapActivityKeyListener implements KeyEvent.Callback {
 			mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
 		} else if (keyCode == KeyEvent.KEYCODE_D) {
 			mapActivity.getMapViewTrackingUtilities().switchRotateMapMode();
+		} if (keyCode == KeyEvent.KEYCODE_MINUS) {
+			mapActivity.changeZoom(-1);
+			return true;
+		} else if (keyCode == KeyEvent.KEYCODE_PLUS || keyCode == KeyEvent.KEYCODE_EQUALS) {
+			mapActivity.changeZoom(1);
+			return true;
 		} else if (mapScrollHelper.isAvailableKeyCode(keyCode)) {
 			return mapScrollHelper.onKeyUp(keyCode, event);
 		} else if (settings.EXTERNAL_INPUT_DEVICE.get() == PARROT_EXTERNAL_DEVICE) {
@@ -120,14 +126,6 @@ public class MapActivityKeyListener implements KeyEvent.Callback {
 				mapActivity.startActivity(intent);
 				return true;
 			}
-		} else if (settings.EXTERNAL_INPUT_DEVICE.get() == GENERIC_EXTERNAL_DEVICE) {
-			if (keyCode == KeyEvent.KEYCODE_MINUS) {
-				mapActivity.changeZoom(-1);
-				return true;
-			} else if (keyCode == KeyEvent.KEYCODE_PLUS || keyCode == KeyEvent.KEYCODE_EQUALS) {
-				mapActivity.changeZoom(1);
-				return true;
-			}
 		} else if (OsmandPlugin.onMapActivityKeyUp(mapActivity, keyCode)) {
 			return true;
 		}