diff --git a/ChangeLog-current.txt b/ChangeLog-current.txt
index 32e4fd1..18061d5 100644
--- a/ChangeLog-current.txt
+++ b/ChangeLog-current.txt
@@ -1,4 +1,4 @@
-Tue May 26 14:50:17 UTC 2009
+Sun Jun  7 03:40:11 UTC 2009
 Sbopkg 0.XX.X released.  This version contains the following fixes and
 enhancements:
 
@@ -105,3 +105,4 @@ enhancements:
   * Remove the old "$APP $VERSION$BUILD $ONOFF" format for the temporary queue
     and instead make all queue formats "$APP" only.  This simplifies some code
     and results in a small speed increase.
+  * Exit edit_build_queue menu with 'ESC'; thanks to Nille for the bug report.
diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index 25f6010..aedb0a3 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -1690,6 +1690,10 @@ edit_build_queue() {
         CHOICE=$? # 0 = Delete, 1 = Cancel, 2 = Done, 3 = Delete All
         REMOVED=$(< $ANSQUEUE)
         case $CHOICE in
+            255|-1) # ESC
+                rm -f $REMOVEQUEUE
+                return 0
+                ;;
             0)
                 echo $REMOVED >> $WORKINGQUEUE
                 sed -i "/^$REMOVED .*$/d" $REMOVEQUEUE