diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
index b35b430..ba4a78c 100644
--- a/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+++ b/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
@@ -5,11 +5,14 @@
 
 package com.threerings.getdown.launcher;
 
-import java.awt.EventQueue;
+import static com.threerings.getdown.Log.log;
+
 import java.awt.Color;
 import java.awt.Container;
-import java.awt.IllegalComponentStateException;
+import java.awt.EventQueue;
 import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.BufferedOutputStream;
@@ -20,7 +23,10 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.KeyStroke;
 import javax.swing.WindowConstants;
 
 import com.samskivert.swing.util.SwingUtil;
@@ -28,7 +34,6 @@ import com.threerings.getdown.data.EnvConfig;
 import com.threerings.getdown.data.SysProps;
 import com.threerings.getdown.util.LaunchUtil;
 import com.threerings.getdown.util.StringUtil;
-import static com.threerings.getdown.Log.log;
 
 /**
  * The main application entry point for Getdown.
@@ -109,6 +114,14 @@ public class GetdownApp
                             handleWindowClose();
                         }
                     });
+                    // handle close on ESC
+                    _frame.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+                            .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel"); //$NON-NLS-1$
+                    _frame.getRootPane().getActionMap().put("Cancel", new AbstractAction() { //$NON-NLS-1$
+                        public void actionPerformed(ActionEvent e) {
+                            handleWindowClose();
+                        }
+                    });
                     // this cannot be called in configureContainer as it is only allowed before the
                     // frame has been displayed for the first time
                     _frame.setUndecorated(_ifc.hideDecorations);