diff --git a/src/inventory.cc b/src/inventory.cc
index 110388c..83bd82e 100644
--- a/src/inventory.cc
+++ b/src/inventory.cc
@@ -542,7 +542,8 @@ void inventoryOpen()
     for (;;) {
         int keyCode = _get_input();
 
-        if (keyCode == KEY_ESCAPE) {
+        // SFALL: Close with 'I'.
+        if (keyCode == KEY_ESCAPE || keyCode == KEY_UPPERCASE_I || keyCode == KEY_LOWERCASE_I) {
             break;
         }
 
diff --git a/src/pipboy.cc b/src/pipboy.cc
index 4fc4949..d154ba0 100644
--- a/src/pipboy.cc
+++ b/src/pipboy.cc
@@ -444,7 +444,8 @@ int pipboyOpen(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) {
+        // SFALL: Close with 'Z'.
+        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/skilldex.cc b/src/skilldex.cc
index 10fc3ad..0e186d9 100644
--- a/src/skilldex.cc
+++ b/src/skilldex.cc
@@ -121,7 +121,8 @@ int skilldexOpen()
     while (rc == -1) {
         int keyCode = _get_input();
 
-        if (keyCode == KEY_ESCAPE || keyCode == 500 || _game_user_wants_to_quit != 0) {
+        // SFALL: Close with 'S'.
+        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) {
             soundPlayFile("ib1p1xx1");