diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
index 5619689abc..9582facf2d 100644
--- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp
+++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -240,6 +240,10 @@ class PlatformX11 : public Platform
         case KeyPress:
           key = XLookupKeysym((XKeyEvent*)&event, 0);
           if (key == XK_Escape)
+          {
+            s_shutdown_requested.Set();
+          }
+          else if (key == XK_F10)
           {
             if (Core::GetState() == Core::State::Running)
             {