diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp
index ffc7b5c8e..8f5da54fa 100644
--- a/desmume/src/cli/main.cpp
+++ b/desmume/src/cli/main.cpp
@@ -686,6 +686,17 @@ static void desmume_cycle(int *sdl_quit, struct my_config * my_config)
               }
             }
             break;
+
+          case SDL_KEYUP:
+            switch (event.key.keysym.sym)
+            {
+              case SDLK_ESCAPE:
+                *sdl_quit = 1;
+                break;
+              default:
+                break;
+            }
+            break;
  
           case SDL_QUIT:
             *sdl_quit = 1;