diff --git a/sway/input/seat.c b/sway/input/seat.c
index c85e9242..76050aa9 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -739,7 +739,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
 
 	if (last_focus) {
 		if (last_workspace) {
-			ipc_event_workspace(last_workspace, container, "focus");
+			if (last_workspace != new_workspace) {
+				 ipc_event_workspace(last_workspace, new_workspace, "focus");
+			}
 			if (!workspace_is_visible(last_workspace)
 					&& workspace_is_empty(last_workspace)) {
 				if (last_workspace == last_focus) {
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index a0f9b6de..9fbbccaf 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -598,7 +598,7 @@ void container_move(struct sway_container *container,
 		next_ws = container_parent(next_ws, C_WORKSPACE);
 	}
 	if (last_ws && next_ws && last_ws != next_ws) {
-		ipc_event_workspace(last_ws, container, "focus");
+		ipc_event_workspace(last_ws, next_ws, "focus");
 		workspace_detect_urgent(last_ws);
 		workspace_detect_urgent(next_ws);
 	}