diff --git a/src/game/editor.cc b/src/game/editor.cc
index 0df6d0e..a53cfc1 100644
--- a/src/game/editor.cc
+++ b/src/game/editor.cc
@@ -725,7 +725,7 @@ int editor_design(bool isCreationMode)
             }
         } else if (keyCode == KEY_CTRL_Q || keyCode == KEY_CTRL_X || keyCode == KEY_F10) {
             game_quit_with_confirm();
-        } else if (keyCode == 502 || keyCode == KEY_ESCAPE || game_user_wants_to_quit != 0) {
+        } else if (keyCode == 502 || keyCode == KEY_ESCAPE || keyCode == KEY_UPPERCASE_C || keyCode == KEY_LOWERCASE_C || game_user_wants_to_quit != 0) {
             rc = 1;
         } else if (glblmode && (keyCode == 517 || keyCode == KEY_UPPERCASE_N || keyCode == KEY_LOWERCASE_N)) {
             NameWindow();
diff --git a/src/game/inventry.cc b/src/game/inventry.cc
index dda96de..8a877f4 100644
--- a/src/game/inventry.cc
+++ b/src/game/inventry.cc
@@ -431,7 +431,7 @@ void handle_inventory()
 
         int keyCode = get_input();
 
-        if (keyCode == KEY_ESCAPE) {
+        if (keyCode == KEY_ESCAPE || keyCode == KEY_UPPERCASE_I || keyCode == KEY_LOWERCASE_I) {
             break;
         }
 
diff --git a/src/game/pipboy.cc b/src/game/pipboy.cc
index 4e57c28..04ae5f6 100644
--- a/src/game/pipboy.cc
+++ b/src/game/pipboy.cc
@@ -569,7 +569,7 @@ int pipboy(int intent)
             break;
         }
 
-        if (keyCode == 503 || keyCode == KEY_ESCAPE || keyCode == KEY_RETURN || keyCode == KEY_UPPERCASE_P || keyCode == KEY_LOWERCASE_P || game_user_wants_to_quit != 0) {
+        if (keyCode == 503 || keyCode == KEY_ESCAPE || keyCode == KEY_RETURN || keyCode == KEY_UPPERCASE_P || keyCode == KEY_LOWERCASE_P || keyCode == KEY_UPPERCASE_Z || keyCode == KEY_LOWERCASE_Z || game_user_wants_to_quit != 0) {
             break;
         }
 
diff --git a/src/game/skilldex.cc b/src/game/skilldex.cc
index 6e1228b..97aa225 100644
--- a/src/game/skilldex.cc
+++ b/src/game/skilldex.cc
@@ -127,7 +127,7 @@ int skilldex_select()
 
         int keyCode = get_input();
 
-        if (keyCode == KEY_ESCAPE || keyCode == 500 || game_user_wants_to_quit != 0) {
+        if (keyCode == KEY_ESCAPE || keyCode == KEY_UPPERCASE_S || keyCode == KEY_LOWERCASE_S || keyCode == 500 || game_user_wants_to_quit != 0) {
             rc = 0;
         } else if (keyCode == KEY_RETURN) {
             gsound_play_sfx_file("ib1p1xx1");