diff --git a/sway/input/seat.c b/sway/input/seat.c
index a934d4a80..6c5abcd88 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -663,7 +663,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 
 		seat_send_focus(container, seat);
-		container_damage_whole(container);
+		container_damage_whole(container->parent);
 	}
 
 	// clean up unfocused empty workspace on new output
diff --git a/sway/main.c b/sway/main.c
index 124f9fbb7..8b0b8612e 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -416,6 +416,7 @@ int main(int argc, char **argv) {
 	security_sanity_check();
 
 	config->active = true;
+	setenv("WAYLAND_DISPLAY", server.socket, true);
 	// Execute commands until there are none left
 	while (config->cmd_queue->length) {
 		char *line = config->cmd_queue->items[0];
diff --git a/sway/server.c b/sway/server.c
index 8106f3c86..cd15f454f 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -143,7 +143,6 @@ void server_fini(struct sway_server *server) {
 void server_run(struct sway_server *server) {
 	wlr_log(L_INFO, "Running compositor on wayland display '%s'",
 			server->socket);
-	setenv("WAYLAND_DISPLAY", server->socket, true);
 	if (!wlr_backend_start(server->backend)) {
 		wlr_log(L_ERROR, "Failed to start backend");
 		wlr_backend_destroy(server->backend);