diff --git a/sway/commands.c b/sway/commands.c
index a3e6a5008..73c968ead 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -103,6 +103,7 @@ static struct cmd_handler handlers[] = {
 	{ "exec_always", cmd_exec_always },
 	{ "floating_maximum_size", cmd_floating_maximum_size },
 	{ "floating_minimum_size", cmd_floating_minimum_size },
+	{ "focus", cmd_focus },
 	{ "focus_follows_mouse", cmd_focus_follows_mouse },
 	{ "focus_wrapping", cmd_focus_wrapping },
 	{ "font", cmd_font },
@@ -137,7 +138,6 @@ static struct cmd_handler command_handlers[] = {
 	{ "border", cmd_border },
 	{ "exit", cmd_exit },
 	{ "floating", cmd_floating },
-	{ "focus", cmd_focus },
 	{ "fullscreen", cmd_fullscreen },
 	{ "kill", cmd_kill },
 	{ "layout", cmd_layout },
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index b24d50070..9cd8bfae7 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -4,9 +4,11 @@
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
+#include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
+#include "stringop.h"
 
 static bool parse_movement_direction(const char *name,
 		enum movement_direction *out) {
@@ -44,7 +46,40 @@ static struct cmd_results *focus_mode(struct sway_container *con,
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
+static struct cmd_results *focus_output(struct sway_container *con,
+		struct sway_seat *seat, int argc, char **argv) {
+	if (!argc) {
+		return cmd_results_new(CMD_INVALID, "focus",
+			"Expected 'focus output <direction|name>'");
+	}
+	char *identifier = join_args(argv, argc);
+	struct sway_container *output = output_by_name(identifier);
+
+	if (!output) {
+		enum movement_direction direction;
+		if (!parse_movement_direction(identifier, &direction) ||
+				direction == MOVE_PARENT || direction == MOVE_CHILD) {
+			free(identifier);
+			return cmd_results_new(CMD_INVALID, "focus",
+				"There is no output with that name");
+		}
+		struct sway_container *focus = seat_get_focus(seat);
+		focus = container_parent(focus, C_OUTPUT);
+		output = container_get_in_direction(focus, seat, direction);
+	}
+
+	free(identifier);
+	if (output) {
+		seat_set_focus(seat, seat_get_focus_inactive(seat, output));
+	}
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
 struct cmd_results *cmd_focus(int argc, char **argv) {
+	if (config->reading || !config->active) {
+		return cmd_results_new(CMD_DEFER, NULL, NULL);
+	}
 	struct sway_container *con = config->handler_context.current_container;
 	struct sway_seat *seat = config->handler_context.seat;
 	if (con->type < C_WORKSPACE) {
@@ -65,7 +100,11 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
 		return focus_mode(con, seat, !container_is_floating(con));
 	}
 
-	// TODO: focus output <direction|name>
+	if (strcmp(argv[0], "output") == 0) {
+		argc--; argv++;
+		return focus_output(con, seat, argc, argv);
+	}
+
 	enum movement_direction direction = 0;
 	if (!parse_movement_direction(argv[0], &direction)) {
 		return cmd_results_new(CMD_INVALID, "focus",
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7a9f3ed77..c76c20b35 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -220,7 +220,6 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		struct sway_drag_icon *drag_icon = wlr_drag_icon->data;
 		drag_icon_update_position(drag_icon);
 	}
-	transaction_commit_dirty();
 }
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
@@ -230,6 +229,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
 	wlr_cursor_move(cursor->cursor, event->device,
 		event->delta_x, event->delta_y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 static void handle_cursor_motion_absolute(
@@ -240,6 +240,7 @@ static void handle_cursor_motion_absolute(
 	struct wlr_event_pointer_motion_absolute *event = data;
 	wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -426,6 +427,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
 
 	wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y);
 	cursor_send_pointer_motion(cursor, event->time_msec, true);
+	transaction_commit_dirty();
 }
 
 static void handle_tool_tip(struct wl_listener *listener, void *data) {
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 197a2fc8b..1f898f8ad 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -232,7 +232,9 @@ void container_move_to(struct sway_container *container,
 	}
 	if (new_workspace != old_workspace) {
 		workspace_detect_urgent(new_workspace);
-		workspace_detect_urgent(old_workspace);
+		if (old_workspace) {
+			workspace_detect_urgent(old_workspace);
+		}
 	}
 }