diff --git a/js/gamepad.js b/js/gamepad.js
index a2b2e9c..b850c61 100644
--- a/js/gamepad.js
+++ b/js/gamepad.js
@@ -30,21 +30,16 @@ class Gamepad {
         // gamepad collection default values
         this.gamepads = {};
         this.gamepadIdentifiers = {
-            "debug": {
+            debug: {
                 id: /debug/,
                 name: "Debug",
                 colors: []
             },
-            "ds4": {
+            ds4: {
                 id: /054c.*?05c4/,
                 name: "DualShock 4",
                 colors: ["black", "white", "red", "blue"]
             },
-            "switch-pro": {
-                id: /057e/,
-                name: "Nintendo Switch Pro Controller",
-                colors: ["black"]
-            },
             "xbox-one": {
                 id: /xinput|XInput/,
                 name: "Xbox One",
@@ -86,7 +81,7 @@ class Gamepad {
         // listen for mouse move events
         window.addEventListener("mousemove", this.onMouseMove.bind(this));
         // listen for keyboard events
-        window.addEventListener("keydown", this.onKeyDown.bind(this));
+        window.addEventListener("keypress", this.onKeyPress.bind(this));
 
         // bind a gamepads scan
         window.setInterval(
@@ -202,7 +197,8 @@ class Gamepad {
      *
      * @param {KeyboardEvent} e
      */
-    onKeyDown(e) {
+    onKeyPress(e) {
+        console.log(e);
         switch (e.code) {
             case "Delete":
             case "Escape":
@@ -231,6 +227,9 @@ class Gamepad {
             case "Minus":
                 this.changeZoom("-");
                 break;
+            case "NumpadDecimal":
+                this.autoAdjustZoom();
+                break;
             case "Numpad0":
             case "Digit0":
                 this.changeZoom("0");
@@ -452,6 +451,9 @@ class Gamepad {
 
                 // inject the template HTML
                 this.$gamepad.html(template);
+                window.setTimeout(() => {
+                    this.autoAdjustZoom(1);
+                });
 
                 // read for parameters to apply:
                 // - color
@@ -672,6 +674,24 @@ class Gamepad {
         this.$gamepad.attr("data-color", this.activeGamepadColorName);
     }
 
+    /**
+     * Adjusts the zoom level to the available space
+     */
+    autoAdjustZoom(maxZoom = null) {
+        // let the browser the time to paint
+        const smallerRatio = Math.min(
+            window.innerWidth /
+                (this.$gamepad.width() / this.activeGamepadZoomLevel),
+            window.innerHeight /
+                (this.$gamepad.height() / this.activeGamepadZoomLevel)
+        );
+        this.changeZoom(
+            maxZoom !== null && smallerRatio >= maxZoom
+                ? maxZoom
+                : Math.floor(smallerRatio * 10) / 10
+        );
+    }
+
     /**
      * Changes the active gamepad zoom level
      *