diff --git a/pixelwar/src/de/paws/pixelwar/Canvas.java b/pixelwar/src/de/paws/pixelwar/Canvas.java
index 8eb9047..fb8de45 100644
--- a/pixelwar/src/de/paws/pixelwar/Canvas.java
+++ b/pixelwar/src/de/paws/pixelwar/Canvas.java
@@ -37,6 +37,10 @@ public class Canvas {
 							drawBuffer.getHeight());
 					g.dispose();
 				}
+				if (e.getKeyChar() == 'q'
+						|| e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+					System.exit(0);
+				}
 			}
 
 			@Override