diff --git a/byobu-config b/byobu-config
index aa18e785..d24a5c75 100755
--- a/byobu-config
+++ b/byobu-config
@@ -425,9 +425,9 @@ 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 ^register "+SHARE+"/keybindings/common")
+            out = commands.getoutput("grep -h ^register "+SHARE+"/keybindings/*keys")
             appendtofile(path, out+"\n")
-            out = commands.getoutput("sed -i -e 's/\"\^a/\"\^"+l+"/' "+path)
+            out = commands.getoutput("sed -i -e 's/\"\^a/\"\^"+l+"/g' "+path)
             out = commands.getoutput("sed -i -e '/^$/d' "+path)
 
 def chgesc(screen, size):
diff --git a/debian/changelog b/debian/changelog
index 9e0ce619..55b8328a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,7 +54,10 @@ byobu (2.12) unreleased; urgency=low
     profiles/profile.skel, rpm/byobu.spec: add a mail status notification,
     LP: #387936
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 18 Jun 2009 00:53:42 -0500
+  * byobu-config: fix keybinding disabling for non-standard escape sequences,
+    LP: #389129
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 19 Jun 2009 00:35:39 -0500
 
 byobu (2.11-0ubuntu1) karmic; urgency=low