--- /usr/share/python-support/miro/miro/frontends/widgets/playback.py.orig	2009-02-10 20:34:17.000000000 +0100
+++ /usr/share/python-support/miro/miro/frontends/widgets/playback.py	2009-02-10 20:36:52.000000000 +0100
@@ -466,10 +466,16 @@
     if len(mods) != 0:
         return False
 
+    # If ESC is pressed in fullscreen mode, go into non-fullscreen mode.
     if key == menubar.ESCAPE and app.playback_manager.is_fullscreen:
         app.widgetapp.on_fullscreen_clicked()
         return True
 
+    # If ESC is pressed in non-fullscreen mode, stop video.
+    if key == menubar.ESCAPE and not app.playback_manager.is_fullscreen:
+        app.widgetapp.on_stop_clicked()
+        return True
+
     if key == menubar.RIGHT_ARROW:
         app.widgetapp.on_skip_forward()
         return True