diff --git a/sway/focus.c b/sway/focus.c
index 48017fdf..a6ffe73f 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -57,7 +57,11 @@ bool move_focus(enum movement_direction direction) {
 	swayc_t *view = get_swayc_in_direction(
 			get_focused_container(&root_container), direction);
 	if (view) {
-		set_focused_container(get_focused_view(view));
+		if (direction == MOVE_PARENT) {
+			set_focused_container(view);
+		} else {
+			set_focused_container(get_focused_view(view));
+		}
 		return true;
 	}
 	return false;