diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java
index 686f8a5f..3eb5174e 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java
@@ -84,14 +84,22 @@ public class Apple2KeypadChooser implements Apple2MenuView {
                 break;
         }
 
+        calibrationContinue();
+    }
+
+    private void calibrationContinue() {
         final Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 mChooserState = mChooserState.next();
-                mCurrentChoicePrompt.setText(getNextChoiceString());
-                Apple2Preferences.setJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT, Apple2SettingsMenu.TouchDeviceVariant.KEYBOARD.ordinal());
-                Apple2Preferences.sync(mActivity, Apple2Preferences.PREF_DOMAIN_TOUCHSCREEN);
+                if (mChooserState.ordinal() == 0) {
+                    dismiss();
+                } else {
+                    mCurrentChoicePrompt.setText(getNextChoiceString());
+                    Apple2Preferences.setJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT, Apple2SettingsMenu.TouchDeviceVariant.KEYBOARD.ordinal());
+                    Apple2Preferences.sync(mActivity, Apple2Preferences.PREF_DOMAIN_TOUCHSCREEN);
+                }
             }
         }, 1000);
     }
@@ -149,7 +157,17 @@ public class Apple2KeypadChooser implements Apple2MenuView {
         skipButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Apple2KeypadChooser.this.onKeyTapCalibrationEvent((char) Apple2KeyboardSettingsMenu.ICONTEXT_NONACTION, -1);
+                Apple2Preferences.setJSONPref(Apple2SettingsMenu.SETTINGS.CURRENT_INPUT, Apple2SettingsMenu.TouchDeviceVariant.JOYSTICK_KEYPAD.ordinal());
+                Apple2Preferences.sync(mActivity, Apple2Preferences.PREF_DOMAIN_TOUCHSCREEN);
+                calibrationContinue();
+            }
+        });
+
+        Button noneButton = (Button) mSettingsView.findViewById(R.id.noneButton);
+        noneButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onKeyTapCalibrationEvent((char) Apple2KeyboardSettingsMenu.ICONTEXT_NONACTION, -1);
             }
         });
 
diff --git a/Android/app/src/main/res/layout/activity_chooser_keypad.xml b/Android/app/src/main/res/layout/activity_chooser_keypad.xml
index 1c990c80..a8098d57 100644
--- a/Android/app/src/main/res/layout/activity_chooser_keypad.xml
+++ b/Android/app/src/main/res/layout/activity_chooser_keypad.xml
@@ -20,11 +20,26 @@
         android:layout_marginLeft="@dimen/preference_margin_left"
         android:layout_marginStart="@dimen/preference_margin_left"
         android:layout_marginTop="@dimen/preference_margin_top"
+        android:background="@color/white"
+        android:textColor="@color/black"
         android:text="@string/keypad_choose_current" />
 
+    <Button
+        android:id="@+id/noneButton"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginEnd="@dimen/preference_margin_right"
+        android:layout_marginRight="@dimen/preference_margin_right"
+        android:layout_marginTop="@dimen/preference_margin_top"
+        android:text="@string/key_none" />
+
     <Button
         android:id="@+id/skipButton"
         style="?android:attr/buttonStyleSmall"
+        android:layout_below="@id/noneButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"