diff --git a/include/sway/view.h b/include/sway/view.h
index ac33e11a..b2886211 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -115,4 +115,6 @@ void view_set_activated(struct sway_view *view, bool activated);
 
 void view_close(struct sway_view *view);
 
+void view_update_outputs(struct sway_view *view, const struct wlr_box *before);
+
 #endif
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index b44d9e54..7371b829 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -72,6 +72,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, sway_surface, commit);
 	struct sway_view *view = sway_surface->view;
 	// NOTE: We intentionally discard the view's desired width here
+	// TODO: Store this for restoration when moving to floating plane
 	// TODO: Let floating views do whatever
 	view->width = sway_surface->pending_width;
 	view->height = sway_surface->pending_height;
diff --git a/sway/tree/view.c b/sway/tree/view.c
index b46c3b17..9499adca 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,3 +1,7 @@
+#include <wayland-server.h>
+#include <wlr/types/wlr_output_layout.h>
+#include "sway/container.h"
+#include "sway/layout.h"
 #include "sway/view.h"
 
 const char *view_get_title(struct sway_view *view) {
@@ -30,13 +34,27 @@ const char *view_get_instance(struct sway_view *view) {
 
 void view_set_size(struct sway_view *view, int width, int height) {
 	if (view->iface.set_size) {
+		struct wlr_box box = {
+			.x = view->swayc->x,
+			.y = view->swayc->y,
+			.width = view->width,
+			.height = view->height,
+		};
 		view->iface.set_size(view, width, height);
+		view_update_outputs(view, &box);
 	}
 }
 
 void view_set_position(struct sway_view *view, double ox, double oy) {
 	if (view->iface.set_position) {
+		struct wlr_box box = {
+			.x = view->swayc->x,
+			.y = view->swayc->y,
+			.width = view->width,
+			.height = view->height,
+		};
 		view->iface.set_position(view, ox, oy);
+		view_update_outputs(view, &box);
 	}
 }
 
@@ -51,3 +69,27 @@ void view_close(struct sway_view *view) {
 		view->iface.close(view);
 	}
 }
+
+void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
+	struct wlr_output_layout *output_layout =
+		root_container.sway_root->output_layout;
+	struct wlr_box box = {
+		.x = view->swayc->x,
+		.y = view->swayc->y,
+		.width = view->width,
+		.height = view->height,
+	};
+	struct wlr_output_layout_output *layout_output;
+	wl_list_for_each(layout_output, &output_layout->outputs, link) {
+		bool intersected = before != NULL && wlr_output_layout_intersects(
+			output_layout, layout_output->output, before);
+		bool intersects = wlr_output_layout_intersects(output_layout,
+			layout_output->output, &box);
+		if (intersected && !intersects) {
+			wlr_surface_send_leave(view->surface, layout_output->output);
+		}
+		if (!intersected && intersects) {
+			wlr_surface_send_enter(view->surface, layout_output->output);
+		}
+	}
+}