diff --git a/dummy.c b/dummy.c
deleted file mode 100644
index 870fde8a..00000000
--- a/dummy.c
+++ /dev/null
@@ -1,2 +0,0 @@
-// This is used to make meson happy
-void dummy(void);
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 10e5bbc6..c245eb09 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -23,7 +23,7 @@ struct roots_output {
 };
 
 struct roots_desktop {
-	struct wlr_list *views;
+	struct wl_list views; // roots_view::link
 
 	struct wl_list outputs;
 	struct timespec last_frame;
@@ -60,6 +60,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		struct roots_config *config);
 void desktop_destroy(struct roots_desktop *desktop);
 
+void view_init(struct roots_view *view, struct roots_desktop *desktop);
 void view_destroy(struct roots_view *view);
 struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy);
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index dad8bbc4..7822bb70 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -14,7 +14,8 @@ struct roots_seat {
 	int32_t touch_id;
 	double touch_x, touch_y;
 
-	struct roots_view *focus;
+	struct wl_list views; // roots_seat_view::link
+	bool has_focus;
 
 	struct wl_list keyboards;
 	struct wl_list pointers;
@@ -22,6 +23,14 @@ struct roots_seat {
 	struct wl_list tablet_tools;
 };
 
+struct roots_seat_view {
+	struct roots_seat *seat;
+	struct roots_view *view;
+	struct wl_list link; // roots_seat::views
+
+	struct wl_listener view_destroy;
+};
+
 struct roots_pointer {
 	struct roots_seat *seat;
 	struct wlr_input_device *device;
@@ -60,7 +69,11 @@ void roots_seat_configure_xcursor(struct roots_seat *seat);
 
 bool roots_seat_has_meta_pressed(struct roots_seat *seat);
 
-void roots_seat_focus_view(struct roots_seat *seat, struct roots_view *view);
+struct roots_view *roots_seat_get_focus(struct roots_seat *seat);
+
+void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view);
+
+void roots_seat_cycle_focus(struct roots_seat *seat);
 
 void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view);
 
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 66fc88bc..0f13b2d6 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -9,7 +9,6 @@
 struct roots_wl_shell_surface {
 	struct roots_view *view;
 
-	// TODO: Maybe destroy listener should go in roots_view
 	struct wl_listener destroy;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
@@ -22,7 +21,6 @@ struct roots_wl_shell_surface {
 struct roots_xdg_surface_v6 {
 	struct roots_view *view;
 
-	// TODO: Maybe destroy listener should go in roots_view
 	struct wl_listener commit;
 	struct wl_listener destroy;
 	struct wl_listener request_move;
@@ -35,7 +33,6 @@ struct roots_xdg_surface_v6 {
 struct roots_xwayland_surface {
 	struct roots_view *view;
 
-	// TODO: Maybe destroy listener should go in roots_view
 	struct wl_listener destroy;
 	struct wl_listener request_configure;
 	struct wl_listener request_move;
@@ -55,6 +52,7 @@ enum roots_view_type {
 
 struct roots_view {
 	struct roots_desktop *desktop;
+	struct wl_list link; // roots_desktop::views
 
 	double x, y;
 	float rotation;
@@ -90,6 +88,10 @@ struct roots_view {
 	};
 	struct wlr_surface *wlr_surface;
 
+	struct {
+		struct wl_signal destroy;
+	} events;
+
 	// TODO: This would probably be better as a field that's updated on a
 	// configure event from the xdg_shell
 	// If not then this should follow the typical type/impl pattern we use
diff --git a/meson.build b/meson.build
index 642dc38d..8ace085c 100644
--- a/meson.build
+++ b/meson.build
@@ -131,7 +131,6 @@ wlr_deps = [
 
 lib_wlr = library(
 	'wlroots',
-	files('dummy.c'),
 	link_whole: wlr_parts,
 	dependencies: wlr_deps,
 	include_directories: wlr_inc,
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 93ee03d4..3cd5da40 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -58,19 +58,21 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
 		}
 		break;
 	case ROOTS_CURSOR_MOVE:
-		if (seat->focus) {
+		view = roots_seat_get_focus(seat);
+		if (view != NULL) {
 			double dx = cursor->cursor->x - cursor->offs_x;
 			double dy = cursor->cursor->y - cursor->offs_y;
-			view_move(seat->focus, cursor->view_x + dx,
+			view_move(view, cursor->view_x + dx,
 				cursor->view_y + dy);
 		}
 		break;
 	case ROOTS_CURSOR_RESIZE:
-		if (seat->focus) {
+		view = roots_seat_get_focus(seat);
+		if (view != NULL) {
 			double dx = cursor->cursor->x - cursor->offs_x;
 			double dy = cursor->cursor->y - cursor->offs_y;
-			double x = seat->focus->x;
-			double y = seat->focus->y;
+			double x = view->x;
+			double y = view->y;
 			int width = cursor->view_width;
 			int height = cursor->view_height;
 			if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
@@ -99,12 +101,12 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
 				height = 1;
 			}
 
-			view_move_resize(seat->focus, x, y, width, height);
+			view_move_resize(view, x, y, width, height);
 		}
 		break;
 	case ROOTS_CURSOR_ROTATE:
-		if (seat->focus) {
-			struct roots_view *view = seat->focus;
+		view = roots_seat_get_focus(seat);
+		if (view != NULL) {
 			int ox = view->x + view->wlr_surface->current->width/2,
 				oy = view->y + view->wlr_surface->current->height/2;
 			int ux = cursor->offs_x - ox,
@@ -118,7 +120,6 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
 		}
 		break;
 	}
-
 }
 
 static void roots_cursor_press_button(struct roots_cursor *cursor,
@@ -135,7 +136,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 	if (state == WLR_BUTTON_PRESSED &&
 			view &&
 			roots_seat_has_meta_pressed(seat)) {
-		roots_seat_focus_view(seat, view);
+		roots_seat_set_focus(seat, view);
 
 		uint32_t edges;
 		switch (button) {
@@ -186,7 +187,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 		cursor->input_events[i].device = device;
 		cursor->input_events_idx = (i + 1)
 			% (sizeof(cursor->input_events) / sizeof(cursor->input_events[0]));
-		roots_seat_focus_view(seat, view);
+		roots_seat_set_focus(seat, view);
 		break;
 	}
 }
diff --git a/rootston/desktop.c b/rootston/desktop.c
index c6a1957c..7962d3ec 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -18,29 +18,6 @@
 #include "rootston/seat.h"
 #include "rootston/xcursor.h"
 
-// TODO replace me with a signal
-void view_destroy(struct roots_view *view) {
-	struct roots_desktop *desktop = view->desktop;
-
-	struct roots_input *input = desktop->server->input;
-	struct roots_seat *seat;
-	wl_list_for_each(seat, &input->seats, link) {
-		if (seat->focus == view) {
-			seat->focus = NULL;
-			seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
-		}
-	}
-
-	for (size_t i = 0; i < desktop->views->length; ++i) {
-		struct roots_view *_view = desktop->views->items[i];
-		if (view == _view) {
-			wlr_list_del(desktop->views, i);
-			break;
-		}
-	}
-	free(view);
-}
-
 void view_get_box(const struct roots_view *view, struct wlr_box *box) {
 	box->x = view->x;
 	box->y = view->y;
@@ -214,12 +191,26 @@ bool view_center(struct roots_view *view) {
 	return true;
 }
 
+void view_destroy(struct roots_view *view) {
+	wl_signal_emit(&view->events.destroy, view);
+
+	wl_list_remove(&view->link);
+	free(view);
+}
+
+void view_init(struct roots_view *view, struct roots_desktop *desktop) {
+	view->desktop = desktop;
+	wl_signal_init(&view->events.destroy);
+
+	wl_list_insert(&desktop->views, &view->link);
+}
+
 void view_setup(struct roots_view *view) {
 	struct roots_input *input = view->desktop->server->input;
 	// TODO what seat gets focus? the one with the last input event?
 	struct roots_seat *seat;
 	wl_list_for_each(seat, &input->seats, link) {
-		roots_seat_focus_view(seat, view);
+		roots_seat_set_focus(seat, view);
 	}
 
 	view_center(view);
@@ -228,25 +219,10 @@ void view_setup(struct roots_view *view) {
 	view_update_output(view, &before);
 }
 
-void view_teardown(struct roots_view *view) {
-	// TODO replace me with a signal
-	/*
-	struct wlr_list *views = view->desktop->views;
-	if (views->length < 2 || views->items[views->length-1] != view) {
-		return;
-	}
-
-	struct roots_view *prev_view = views->items[views->length-2];
-	struct roots_input *input = prev_view->desktop->server->input;
-	set_view_focus(input, prev_view->desktop, prev_view);
-	*/
-}
-
 struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
-	for (ssize_t i = desktop->views->length - 1; i >= 0; --i) {
-		struct roots_view *view = desktop->views->items[i];
-
+	struct roots_view *view;
+	wl_list_for_each(view, &desktop->views, link) {
 		if (view->type == ROOTS_WL_SHELL_VIEW &&
 				view->wl_shell_surface->state ==
 				WLR_WL_SHELL_SURFACE_STATE_POPUP) {
@@ -335,11 +311,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		return NULL;
 	}
 
-	desktop->views = wlr_list_create();
-	if (desktop->views == NULL) {
-		free(desktop);
-		return NULL;
-	}
+	wl_list_init(&desktop->views);
 	wl_list_init(&desktop->outputs);
 
 	desktop->output_add.notify = output_add_notify;
@@ -363,7 +335,6 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 	if (desktop->xcursor_manager == NULL) {
 		wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s",
 			cursor_theme);
-		wlr_list_free(desktop->views);
 		free(desktop);
 		return NULL;
 	}
diff --git a/rootston/input.c b/rootston/input.c
index a5d710c4..ce20e840 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -116,7 +116,7 @@ bool input_view_has_focus(struct roots_input *input, struct roots_view *view) {
 	}
 	struct roots_seat *seat;
 	wl_list_for_each(seat, &input->seats, link) {
-		if (seat->focus == view) {
+		if (view == roots_seat_get_focus(seat)) {
 			return true;
 		}
 	}
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index 39f46a32..f3fc9a85 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -87,20 +87,16 @@ static const char *exec_prefix = "exec ";
 
 static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 		const char *command) {
-	struct roots_server *server = keyboard->input->server;
+	struct roots_seat *seat = keyboard->seat;
 	if (strcmp(command, "exit") == 0) {
-		wl_display_terminate(server->wl_display);
+		wl_display_terminate(keyboard->input->server->wl_display);
 	} else if (strcmp(command, "close") == 0) {
-		if (server->desktop->views->length > 0) {
-			struct roots_view *view =
-				server->desktop->views->items[server->desktop->views->length-1];
-			view_close(view);
+		struct roots_view *focus = roots_seat_get_focus(seat);
+		if (focus != NULL) {
+			view_close(focus);
 		}
 	} else if (strcmp(command, "next_window") == 0) {
-		if (server->desktop->views->length > 0) {
-			struct roots_view *view = server->desktop->views->items[0];
-			roots_seat_focus_view(keyboard->seat, view);
-		}
+		roots_seat_cycle_focus(seat);
 	} else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) {
 		const char *shell_cmd = command + strlen(exec_prefix);
 		pid_t pid = fork();
diff --git a/rootston/output.c b/rootston/output.c
index b551dcf4..83ff37fd 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -38,7 +38,7 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
 static void render_surface(struct wlr_surface *surface,
 		struct roots_desktop *desktop, struct wlr_output *wlr_output,
 		struct timespec *when, double lx, double ly, float rotation) {
-	if (surface->texture->valid) {
+	if (wlr_surface_has_buffer(surface)) {
 		int width = surface->current->width;
 		int height = surface->current->height;
 		int render_width = width * wlr_output->scale;
@@ -186,8 +186,8 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	wlr_output_make_current(wlr_output);
 	wlr_renderer_begin(server->renderer, wlr_output);
 
-	for (size_t i = 0; i < desktop->views->length; ++i) {
-		struct roots_view *view = desktop->views->items[i];
+	struct roots_view *view;
+	wl_list_for_each_reverse(view, &desktop->views, link) {
 		render_view(view, desktop, wlr_output, &now);
 	}
 
diff --git a/rootston/seat.c b/rootston/seat.c
index c24ee787..737bbd67 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -229,6 +229,7 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
 	wl_list_init(&seat->pointers);
 	wl_list_init(&seat->touch);
 	wl_list_init(&seat->tablet_tools);
+	wl_list_init(&seat->views);
 
 	seat->input = input;
 
@@ -484,9 +485,69 @@ bool roots_seat_has_meta_pressed(struct roots_seat *seat) {
 	return false;
 }
 
-void roots_seat_focus_view(struct roots_seat *seat, struct roots_view *view) {
-	struct roots_desktop *desktop = seat->input->server->desktop;
-	if (seat->focus == view) {
+struct roots_view *roots_seat_get_focus(struct roots_seat *seat) {
+	if (!seat->has_focus || wl_list_empty(&seat->views)) {
+		return NULL;
+	}
+	struct roots_seat_view *seat_view =
+		wl_container_of(seat->views.next, seat_view, link);
+	return seat_view->view;
+}
+
+static void seat_view_destroy(struct roots_seat_view *seat_view) {
+	struct roots_seat *seat = seat_view->seat;
+
+	if (seat_view->view == roots_seat_get_focus(seat)) {
+		seat->has_focus = false;
+		seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
+	}
+
+	wl_list_remove(&seat_view->view_destroy.link);
+	wl_list_remove(&seat_view->link);
+	free(seat_view);
+
+	// Focus first view
+	if (!wl_list_empty(&seat->views)) {
+		struct roots_seat_view *first_seat_view = wl_container_of(
+			seat->views.next, first_seat_view, link);
+		roots_seat_set_focus(seat, first_seat_view->view);
+	}
+}
+
+static void seat_view_handle_destroy(struct wl_listener *listener, void *data) {
+	struct roots_seat_view *seat_view =
+		wl_container_of(listener, seat_view, view_destroy);
+	seat_view_destroy(seat_view);
+}
+
+static struct roots_seat_view *seat_add_view(struct roots_seat *seat,
+		struct roots_view *view) {
+	struct roots_seat_view *seat_view =
+		calloc(1, sizeof(struct roots_seat_view));
+	if (seat_view == NULL) {
+		return NULL;
+	}
+	seat_view->seat = seat;
+	seat_view->view = view;
+
+	wl_list_insert(&seat->views, &seat_view->link);
+
+	seat_view->view_destroy.notify = seat_view_handle_destroy;
+	wl_signal_add(&view->events.destroy, &seat_view->view_destroy);
+
+	return seat_view;
+}
+
+void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
+	// Make sure the view will be rendered on top of others, even if it's
+	// already focused in this seat
+	if (view != NULL) {
+		wl_list_remove(&view->link);
+		wl_list_insert(&seat->input->server->desktop->views, &view->link);
+	}
+
+	struct roots_view *prev_focus = roots_seat_get_focus(seat);
+	if (view == prev_focus) {
 		return;
 	}
 
@@ -495,33 +556,67 @@ void roots_seat_focus_view(struct roots_seat *seat, struct roots_view *view) {
 		return;
 	}
 
-	struct roots_view *prev_focus = seat->focus;
-	seat->focus = view;
+	struct roots_seat_view *seat_view = NULL;
+	if (view != NULL) {
+		bool found = false;
+		wl_list_for_each(seat_view, &seat->views, link) {
+			if (seat_view->view == view) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			seat_view = seat_add_view(seat, view);
+			if (seat_view == NULL) {
+				wlr_log(L_ERROR, "Allocation failed");
+				return;
+			}
+		}
+	}
 
-	// unfocus the old view if it is not focused by some other seat
-	if (prev_focus && !input_view_has_focus(seat->input, prev_focus)) {
+	seat->has_focus = false;
+
+	// Deactivate the old view if it is not focused by some other seat
+	if (prev_focus != NULL && !input_view_has_focus(seat->input, prev_focus)) {
 		view_activate(prev_focus, false);
 	}
 
-	if (!seat->focus) {
+	if (view == NULL) {
 		seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
 		return;
 	}
 
-	size_t index = 0;
-	for (size_t i = 0; i < desktop->views->length; ++i) {
-		struct roots_view *_view = desktop->views->items[i];
-		if (_view == view) {
-			index = i;
-			break;
-		}
+	view_activate(view, true);
+
+	seat->has_focus = true;
+	wl_list_remove(&seat_view->link);
+	wl_list_insert(&seat->views, &seat_view->link);
+	wlr_seat_keyboard_notify_enter(seat->seat, view->wlr_surface);
+}
+
+void roots_seat_cycle_focus(struct roots_seat *seat) {
+	if (wl_list_empty(&seat->views)) {
+		return;
 	}
 
-	view_activate(view, true);
-	// TODO: list_swap
-	wlr_list_del(desktop->views, index);
-	wlr_list_add(desktop->views, view);
-	wlr_seat_keyboard_notify_enter(seat->seat, view->wlr_surface);
+	struct roots_seat_view *first_seat_view = wl_container_of(
+		seat->views.next, first_seat_view, link);
+	if (!seat->has_focus) {
+		roots_seat_set_focus(seat, first_seat_view->view);
+		return;
+	}
+	if (wl_list_length(&seat->views) < 2) {
+		return;
+	}
+
+	// Focus the next view
+	struct roots_seat_view *next_seat_view = wl_container_of(
+		first_seat_view->link.next, next_seat_view, link);
+	roots_seat_set_focus(seat, next_seat_view->view);
+
+	// Move the first view to the end of the list
+	wl_list_remove(&first_seat_view->link);
+	wl_list_insert(seat->views.prev, &first_seat_view->link);
 }
 
 void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view) {
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index 0043219f..4b1f61e5 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -94,7 +94,6 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct roots_wl_shell_surface *roots_surface =
 		wl_container_of(listener, roots_surface, destroy);
-	view_teardown(roots_surface->view);
 	wl_list_remove(&roots_surface->destroy.link);
 	wl_list_remove(&roots_surface->request_move.link);
 	wl_list_remove(&roots_surface->request_resize.link);
@@ -105,14 +104,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	free(roots_surface);
 }
 
-static int shell_surface_compare_equals(const void *item, const void *cmp_to) {
-	const struct roots_view *view = item;
-	if (view->type == ROOTS_WL_SHELL_VIEW && view->wl_shell_surface == cmp_to) {
-		return 0;
-	}
-	return -1;
-}
-
 void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, wl_shell_surface);
@@ -155,17 +146,23 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	view->wlr_surface = surface->surface;
 	view->resize = resize;
 	view->close = close;
-	view->desktop = desktop;
 	roots_surface->view = view;
-	wlr_list_add(desktop->views, view);
+	view_init(view, desktop);
+
 	view_setup(view);
 
 	if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) {
-		// we need to map it relative to the parent
-		int i = wlr_list_seq_find(desktop->views, shell_surface_compare_equals,
-			surface->parent);
-		if (i != -1) {
-			struct roots_view *parent = desktop->views->items[i];
+		// We need to map it relative to the parent
+		bool found = false;
+		struct roots_view *parent;
+		wl_list_for_each(parent, &desktop->views, link) {
+			if (parent->type == ROOTS_WL_SHELL_VIEW &&
+					parent->wl_shell_surface == surface->parent) {
+				found = true;
+				break;
+			}
+		}
+		if (found) {
 			view_move(view,
 				parent->x + surface->transient_state->x,
 				parent->y + surface->transient_state->y);
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 95df36a2..6d7ff494 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -197,7 +197,6 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct roots_xdg_surface_v6 *roots_xdg_surface =
 		wl_container_of(listener, roots_xdg_surface, destroy);
-	view_teardown(roots_xdg_surface->view);
 	wl_list_remove(&roots_xdg_surface->commit.link);
 	wl_list_remove(&roots_xdg_surface->destroy.link);
 	wl_list_remove(&roots_xdg_surface->request_move.link);
@@ -255,9 +254,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	view->move_resize = move_resize;
 	view->maximize = maximize;
 	view->close = close;
-	view->desktop = desktop;
 	roots_surface->view = view;
-	wlr_list_add(desktop->views, view);
+	view_init(view, desktop);
 
 	view_setup(view);
 }
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index b2f64879..640694f7 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -106,7 +106,6 @@ static void maximize(struct roots_view *view, bool maximized) {
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, destroy);
-	view_teardown(roots_surface->view);
 	wl_list_remove(&roots_surface->destroy.link);
 	wl_list_remove(&roots_surface->request_configure.link);
 	wl_list_remove(&roots_surface->request_move.link);
@@ -206,8 +205,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
 static void handle_map_notify(struct wl_listener *listener, void *data) {
 	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, map_notify);
+	struct wlr_xwayland_surface *xsurface = data;
 	struct roots_view *view = roots_surface->view;
-	struct wlr_xwayland_surface *xsurface = view->xwayland_surface;
 	struct roots_desktop *desktop = view->desktop;
 
 	view->wlr_surface = xsurface->surface;
@@ -218,23 +217,17 @@ static void handle_map_notify(struct wl_listener *listener, void *data) {
 	wl_signal_add(&xsurface->surface->events.commit,
 		&roots_surface->surface_commit);
 
-	wlr_list_push(desktop->views, roots_surface->view);
+	wl_list_insert(&desktop->views, &view->link);
 }
 
 static void handle_unmap_notify(struct wl_listener *listener, void *data) {
 	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, unmap_notify);
-	struct roots_desktop *desktop = roots_surface->view->desktop;
 	roots_surface->view->wlr_surface = NULL;
 
 	wl_list_remove(&roots_surface->surface_commit.link);
 
-	for (size_t i = 0; i < desktop->views->length; i++) {
-		if (desktop->views->items[i] == roots_surface->view) {
-			wlr_list_del(desktop->views, i);
-			break;
-		}
-	}
+	wl_list_remove(&roots_surface->view->link);
 }
 
 void handle_xwayland_surface(struct wl_listener *listener, void *data) {
@@ -284,7 +277,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	view->xwayland_surface = surface;
 	view->roots_xwayland_surface = roots_surface;
 	view->wlr_surface = surface->surface;
-	view->desktop = desktop;
 	view->activate = activate;
 	view->resize = resize;
 	view->move = move;
@@ -292,7 +284,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	view->maximize = maximize;
 	view->close = close;
 	roots_surface->view = view;
-	wlr_list_add(desktop->views, view);
+	view_init(view, desktop);
 
 	if (!surface->override_redirect) {
 		view_setup(view);
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index dff9fac2..36722591 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -42,6 +42,7 @@ const char *atom_map[ATOM_LAST] = {
 	"_NET_WM_STATE_FULLSCREEN",
 	"_NET_WM_STATE_MAXIMIZED_VERT",
 	"_NET_WM_STATE_MAXIMIZED_HORZ",
+	"WM_STATE",
 };
 
 /* General helpers */
@@ -641,8 +642,8 @@ static void xsurface_set_wm_state(struct wlr_xwayland_surface *xsurface,
 	xcb_change_property(xwm->xcb_conn,
 		XCB_PROP_MODE_REPLACE,
 		xsurface->window_id,
-		xwm->atoms[NET_WM_STATE],
-		xwm->atoms[NET_WM_STATE],
+		xwm->atoms[WM_STATE],
+		xwm->atoms[WM_STATE],
 		32, // format
 		2, property);
 }
diff --git a/xwayland/xwm.h b/xwayland/xwm.h
index 547cd5eb..c350b6e2 100644
--- a/xwayland/xwm.h
+++ b/xwayland/xwm.h
@@ -30,6 +30,7 @@ enum atom_name {
 	_NET_WM_STATE_FULLSCREEN,
 	_NET_WM_STATE_MAXIMIZED_VERT,
 	_NET_WM_STATE_MAXIMIZED_HORZ,
+	WM_STATE,
 	ATOM_LAST,
 };