diff --git a/include/config.h b/include/config.h
index c896b423..3d501cbe 100644
--- a/include/config.h
+++ b/include/config.h
@@ -24,6 +24,7 @@ struct sway_mode {
 
 struct output_config {
 	char *name;
+    bool enabled;
 	int width, height;
 	int x, y;
 };
diff --git a/sway/commands.c b/sway/commands.c
index 5de1fb0c..9a0bc076 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -372,8 +372,13 @@ static bool cmd_output(struct sway_config *config, int argc, char **argv) {
 	struct output_config *output = calloc(1, sizeof(struct output_config));
 	output->x = output->y = output->width = output->height = -1;
 	output->name = strdup(argv[0]);
+    output->enabled = true;
 
 	// TODO: atoi doesn't handle invalid numbers
+    
+    if (strcmp(argv[1], "disable") == 0) {
+        output->enabled = false;
+    }
 
 	int i;
 	for (i = 1; i < argc; ++i) {
diff --git a/sway/container.c b/sway/container.c
index 127e1ecd..6debeea3 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -70,6 +70,10 @@ swayc_t *new_output(wlc_handle handle) {
 		oc = NULL;
 	}
 
+    if (oc && !oc->enabled) {
+        return NULL;
+    }
+
 	swayc_t *output = new_swayc(C_OUTPUT);
 	if (oc && oc->width != -1 && oc->height != -1) {
 		output->width = oc->width;
diff --git a/sway/handlers.c b/sway/handlers.c
index e4018811..9fca6387 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -86,11 +86,22 @@ swayc_t *container_under_pointer(void) {
 static bool handle_output_created(wlc_handle output) {
 	swayc_t *op = new_output(output);
 
+    if (!op) {
+        return false;
+    }
+
+        wlc_output_focus(output);
 	// Switch to workspace if we need to
 	if (swayc_active_workspace() == NULL) {
+        sway_log(L_INFO, "Focus switch");
 		swayc_t *ws = op->children->items[0];
 		workspace_switch(ws);
 	}
+    /*
+    if (wlc_output_get_sleep(wlc_get_focused_output())) {
+        wlc_output_focus(output);
+    }
+    */
 	return true;
 }