diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7d280a6c3..5680eec4a 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1482,7 +1482,8 @@ void MainWindow::OnKeyUp(wxKeyEvent& event)
 
 void MainWindow::OnKeyDown(wxKeyEvent& event)
 {
-	if (event.AltDown() && event.GetKeyCode() == WXK_F4)
+	if ((event.AltDown() && event.GetKeyCode() == WXK_F4) || 
+		(event.CmdDown() && event.GetKeyCode() == 'Q'))
 	{
 		Close(true);
 	}