diff --git a/ChangeLog b/ChangeLog
index 86a4c80e59..e0948b299d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-03  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c
+	(gimp_display_shell_events): don't use Escape to quit full-screen
+	mode, it collides with tools using the Escape key (bug #539949).
+
 2008-07-03  Lars-Peter Clausen  <lars@metafoo.de>
 
 	* plug-ins/pygimp/pygimp-drawable.c
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index b98bf6c8a0..93c30b9756 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -175,11 +175,7 @@ gimp_display_shell_events (GtkWidget        *widget,
           case GDK_KP_Enter:
           case GDK_ISO_Enter:
           case GDK_BackSpace:
-            break;
-
           case GDK_Escape:
-            if (event->type == GDK_KEY_PRESS)
-              gimp_display_shell_set_fullscreen (shell, FALSE);
             break;
 
           default: