2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9959509..8955409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*07/03/18:
+   * Fixed problem with new mouse binding code when using emacs keychains (Mark)
+     Keys.cc/hh
 *07/03/17:
    * Iconified, stuck windows weren't being moved to different workspaces (Mark)
      Screen.cc
diff --git a/src/Keys.hh b/src/Keys.hh
index 0365cf8..c075d38 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -111,6 +111,8 @@ private:
 
         t_key *find(int type_, unsigned int mod_, unsigned int key_,
                     int context_) {
+            // t_key ctor sets context_ of 0 to GLOBAL, so we must here too
+            context_ = context_ ? context_ : GLOBAL;
             for (size_t i = 0; i < keylist.size(); i++) {
                 if (keylist[i]->type == type_ && keylist[i]->key == key_ &&
                     (keylist[i]->context & context_) > 0 && keylist[i]->mod ==