diff --git a/tmux.h b/tmux.h
index 2d9e992a..1333bdf0 100644
--- a/tmux.h
+++ b/tmux.h
@@ -110,7 +110,7 @@ extern char   **environ;
 #define KEYC_SHIFT 0x8000
 #define KEYC_PREFIX 0x10000
 
-/* Mask to obtain key w/o modifiers */
+/* Mask to obtain key w/o modifiers. */
 #define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_PREFIX)
 #define KEYC_MASK_KEY (~KEYC_MASK_MOD)
 
diff --git a/xterm-keys.c b/xterm-keys.c
index 1e5583f7..fd9fee8a 100644
--- a/xterm-keys.c
+++ b/xterm-keys.c
@@ -174,8 +174,6 @@ xterm_keys_lookup(int key)
 		modifiers += 2;
 	if (key & KEYC_CTRL)
 		modifiers += 4;
-	if (key & KEYC_ESCAPE)
-		modifiers += 8;
 
 	/*
 	 * If the key has no modifiers, return NULL and let it fall through to