diff --git a/input-keys.c b/input-keys.c
index 123044fe..b43e69d7 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -144,7 +144,8 @@ input_key(struct window_pane *wp, int key, struct mouse_event *m)
 	char			       *out;
 	u_char				ch;
 
-	log_debug("writing key 0x%x (%s)", key, key_string_lookup_key(key));
+	log_debug("writing key 0x%x (%s) to %%%u", key,
+	    key_string_lookup_key(key), wp->id);
 
 	/* If this is a mouse key, pass off to mouse function. */
 	if (KEYC_IS_MOUSE(key)) {
@@ -250,6 +251,6 @@ input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 		buf[len++] = x + 33;
 		buf[len++] = y + 33;
 	}
-	log_debug("writing mouse %.*s", (int)len, buf);
+	log_debug("writing mouse %.*s to %%%u", (int)len, buf, wp->id);
 	bufferevent_write(wp->event, buf, len);
 }
diff --git a/server-client.c b/server-client.c
index 08bf5024..57f0de49 100644
--- a/server-client.c
+++ b/server-client.c
@@ -368,6 +368,8 @@ server_client_check_mouse(struct client *c)
 			wp = window_get_active_at(s->curw->window, x, y);
 			if (wp != NULL)
 				where = PANE;
+			log_debug("mouse at %u,%u is on pane %%%u", x, y,
+			    wp->id);
 		}
 		if (where == NOWHERE)
 			return (KEYC_NONE);