diff --git a/include/sway/output.h b/include/sway/output.h
index 16451d81f..5950f0d6d 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -44,6 +44,7 @@ struct sway_output {
 	struct wl_listener destroy;
 	struct wl_listener commit;
 	struct wl_listener mode;
+	struct wl_listener available_modes;
 	struct wl_listener present;
 	struct wl_listener damage_destroy;
 	struct wl_listener damage_frame;
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 06acb8686..6a594c226 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -872,6 +872,17 @@ static void handle_mode(struct wl_listener *listener, void *data) {
 	update_output_manager_config(output->server);
 }
 
+static void handle_available_modes(struct wl_listener *listener, void *data) {
+	struct sway_output *output = wl_container_of(listener, output, available_modes);
+	struct output_config *oc = find_output_config(output);
+	apply_output_config(oc, output);
+	free_output_config(oc);
+
+	transaction_commit_dirty();
+
+	update_output_manager_config(output->server);
+}
+
 static void update_textures(struct sway_container *con, void *data) {
 	container_update_title_textures(con);
 	container_update_marks_textures(con);
@@ -928,6 +939,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	output->commit.notify = handle_commit;
 	wl_signal_add(&wlr_output->events.mode, &output->mode);
 	output->mode.notify = handle_mode;
+	wl_signal_add(&wlr_output->events.available_modes, &output->available_modes);
+	output->available_modes.notify = handle_available_modes;
 	wl_signal_add(&wlr_output->events.present, &output->present);
 	output->present.notify = handle_present;
 	wl_signal_add(&output->damage->events.frame, &output->damage_frame);