diff --git a/debian/changelog b/debian/changelog
index 8a695746..497a52cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ byobu (3.35c) unreleased; urgency=low
     - add a byobu-quiet utility, to silence eyecandy
   * usr/share/man/man1/byobu-ctrl-a.1, usr/share/man/man1/byobu-quiet.1,
     usr/share/man/man1/Makefile.am: document the new tools
+  * usr/bin/byobu-config: ensure that escape key changing through byobu-config
+    continues to work
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 May 2011 12:11:10 -0500
 
diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config
index 64f4c6ea..238982ef 100755
--- a/usr/bin/byobu-config
+++ b/usr/bin/byobu-config
@@ -482,7 +482,7 @@ def setesckey(key):
             out = commands.getoutput(SED+" -i -e 's/^escape.*$//' "+path)
             appendtofile(path, "escape ^"+u+l+"\n")
             out = commands.getoutput(SED+" -i -e 's/^register.*$//' "+path)
-            out = commands.getoutput("grep -h ^register "+SHARE+"/keybindings/*keys")
+            out = commands.getoutput("grep -sh '^register x' "+SHARE+"/keybindings/*keys")
             appendtofile(path, out+"\n")
             out = commands.getoutput(SED+" -i -e 's/\"^^/\"\^"+l+"/g' "+path)
             out = commands.getoutput(SED+" -i -e '/^$/d' "+path)