diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 35738894b..3f46c5486 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -55,6 +55,7 @@ struct sway_cursor {
 	struct wl_listener tool_tip;
 	struct wl_listener tool_proximity;
 	struct wl_listener tool_button;
+	bool simulated_tool_tip_down;
 	uint32_t tool_buttons;
 
 	struct wl_listener request_set_cursor;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 0649f4688..a28da9992 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -618,8 +618,9 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
 			wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);
 		}
 
+		cursor->simulated_tool_tip_down = event->state == WLR_TABLET_TOOL_TIP_DOWN;
 		dispatch_cursor_button(cursor, event->device, event->time_msec,
-				BTN_LEFT, event->state == WLR_TABLET_TOOL_TIP_DOWN ?
+				BTN_LEFT, cursor->simulated_tool_tip_down ?
 					WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED);
 		wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
 		transaction_commit_dirty();
@@ -630,6 +631,12 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
 		wlr_tablet_v2_tablet_tool_notify_down(sway_tool->tablet_v2_tool);
 		wlr_tablet_tool_v2_start_implicit_grab(sway_tool->tablet_v2_tool);
 	} else {
+		if (cursor->simulated_tool_tip_down) {
+			dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT,
+					WLR_BUTTON_RELEASED);
+			cursor->simulated_tool_tip_down = false;
+		}
+
 		wlr_tablet_v2_tablet_tool_notify_up(sway_tool->tablet_v2_tool);
 	}
 }