diff --git a/cmd-new-session.c b/cmd-new-session.c
index 1de2eb69..8e5520c6 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -105,8 +105,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 			if (args_has(args, 'A')) {
 				/*
 				 * This item is now destined for
-				 * attach-session.  Because attach-session
-				 * will have already been prepared, copy this
+				 * attach-session. Because attach-session will
+				 * have already been prepared, copy this
 				 * session into its tflag so it can be used.
 				 */
 				cmd_find_from_session(&item->state.tflag, as);
diff --git a/server-client.c b/server-client.c
index e6ca8a42..e2d1c5d9 100644
--- a/server-client.c
+++ b/server-client.c
@@ -328,7 +328,7 @@ server_client_check_mouse(struct client *c)
 		type = WHEEL;
 		x = m->x, y = m->y, b = m->b;
 		log_debug("wheel at %u,%u", x, y);
-	} else if (MOUSE_BUTTONS(m->b) == 3) {
+	} else if (MOUSE_RELEASE(m->b)) {
 		type = UP;
 		x = m->x, y = m->y, b = m->lb;
 		log_debug("up at %u,%u", x, y);
@@ -423,7 +423,7 @@ have_event:
 		m->wp = -1;
 
 	/* Stop dragging if needed. */
-	if (type != DRAG && c->tty.mouse_drag_flag) {
+	if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag) {
 		if (c->tty.mouse_drag_release != NULL)
 			c->tty.mouse_drag_release(c, m);