diff --git a/backend/x11/output.c b/backend/x11/output.c
index d1426b6f4..a3a48fb00 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -26,6 +26,7 @@
 static const uint32_t SUPPORTED_OUTPUT_STATE =
 	WLR_OUTPUT_STATE_BACKEND_OPTIONAL |
 	WLR_OUTPUT_STATE_BUFFER |
+	WLR_OUTPUT_STATE_ENABLED |
 	WLR_OUTPUT_STATE_MODE |
 	WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED;
 
@@ -350,6 +351,14 @@ static bool output_commit(struct wlr_output *wlr_output,
 		return false;
 	}
 
+	if (state->committed & WLR_OUTPUT_STATE_ENABLED) {
+		if (state->enabled) {
+			xcb_map_window(x11->xcb, output->win);
+		} else {
+			xcb_unmap_window(x11->xcb, output->win);
+		}
+	}
+
 	if (state->committed & WLR_OUTPUT_STATE_MODE) {
 		if (!output_set_custom_mode(wlr_output,
 				state->custom_mode.width,