diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 12ce48398..fab7f3ecb 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -134,6 +134,9 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 	// Operate on parent container, like i3.
 	if (container) {
 		container = container->pending.parent;
+		if (container && container->pending.children->length == 1) {
+			container = container->pending.parent;
+		}
 	}
 
 	// We could be working with a container OR a workspace. These are different