diff --git a/input-keys.c b/input-keys.c
index 69c5199e..f415e3a7 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -253,12 +253,12 @@ static void
 input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 {
 	struct screen	*s = wp->screen;
-	int		 mode = s->mode;
 	char		 buf[40];
 	size_t		 len;
 	u_int		 x, y;
 
-	if ((mode & ALL_MOUSE_MODES) == 0)
+	/* Ignore events if no mouse mode or the pane is not visible. */
+	if (m->ignore || (s->mode & ALL_MOUSE_MODES) == 0)
 		return;
 	if (cmd_mouse_at(wp, m, &x, &y, 0) != 0)
 		return;
@@ -266,8 +266,7 @@ input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 		return;
 
 	/* If this pane is not in button or all mode, discard motion events. */
-	if (MOUSE_DRAG(m->b) &&
-	    (mode & (MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)) == 0)
+	if (MOUSE_DRAG(m->b) && (s->mode & MOTION_MOUSE_MODES) == 0)
 	    return;
 
 	/*
@@ -279,13 +278,13 @@ input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 	if (m->sgr_type != ' ') {
 		if (MOUSE_DRAG(m->sgr_b) &&
 		    MOUSE_BUTTONS(m->sgr_b) == 3 &&
-		    (~mode & MODE_MOUSE_ALL))
+		    (~s->mode & MODE_MOUSE_ALL))
 			return;
 	} else {
 		if (MOUSE_DRAG(m->b) &&
 		    MOUSE_BUTTONS(m->b) == 3 &&
 		    MOUSE_BUTTONS(m->lb) == 3 &&
-		    (~mode & MODE_MOUSE_ALL))
+		    (~s->mode & MODE_MOUSE_ALL))
 			return;
 	}
 
diff --git a/server-client.c b/server-client.c
index b3f3ad3d..17a1c9de 100644
--- a/server-client.c
+++ b/server-client.c
@@ -417,6 +417,7 @@ server_client_check_mouse(struct client *c, struct key_event *event)
 	struct winlink		*wl;
 	struct window_pane	*wp;
 	u_int			 x, y, b, sx, sy, px, py;
+	int			 ignore = 0;
 	key_code		 key;
 	struct timeval		 tv;
 	struct style_range	*sr;
@@ -443,6 +444,7 @@ server_client_check_mouse(struct client *c, struct key_event *event)
 	if (event->key == KEYC_DOUBLECLICK) {
 		type = DOUBLE;
 		x = m->x, y = m->y, b = m->b;
+		ignore = 1;
 		log_debug("double-click at %u,%u", x, y);
 	} else if ((m->sgr_type != ' ' &&
 	    MOUSE_DRAG(m->sgr_b) &&
@@ -489,16 +491,17 @@ server_client_check_mouse(struct client *c, struct key_event *event)
 				type = TRIPLE;
 				x = m->x, y = m->y, b = m->b;
 				log_debug("triple-click at %u,%u", x, y);
+				ignore = 1;
 				goto have_event;
 			}
-		}
+		} else
+			c->flags |= CLIENT_DOUBLECLICK;
 
+	add_timer:
 		type = DOWN;
 		x = m->x, y = m->y, b = m->b;
 		log_debug("down at %u,%u", x, y);
-		c->flags |= CLIENT_DOUBLECLICK;
 
-	add_timer:
 		if (KEYC_CLICK_TIMEOUT != 0) {
 			memcpy(&c->click_event, m, sizeof c->click_event);
 			c->click_button = m->b;
@@ -517,6 +520,7 @@ have_event:
 	/* Save the session. */
 	m->s = s->id;
 	m->w = -1;
+	m->ignore = ignore;
 
 	/* Is this on the status line? */
 	m->statusat = status_at_line(c);
diff --git a/tmux.h b/tmux.h
index c1de98e0..6f725ca7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -563,6 +563,7 @@ struct msg_write_close {
 
 #define ALL_MODES 0xffffff
 #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)
+#define MOTION_MOUSE_MODES (MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)
 
 /*
  * A single UTF-8 character. UTF8_SIZE must be big enough to hold
@@ -1119,6 +1120,7 @@ RB_HEAD(sessions, session);
 /* Mouse input. */
 struct mouse_event {
 	int		valid;
+	int		ignore;
 
 	key_code	key;