1 files changed, 9 insertions, 0 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index b127c89f..1aae3838 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -308,6 +308,15 @@ static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
 		con = container_wrap_children(con);
 		workspace->layout = L_HORIZ;
 	}
+
+	// If the container is in a floating split container,
+	// operate on the split container instead of the child.
+	if (container_is_floating_or_child(con)) {
+		while (con->parent->layout != L_FLOATING) {
+			con = con->parent;
+		}
+	}
+
 	if (con->scratchpad) {
 		return cmd_results_new(CMD_INVALID, "move",
 				"Container is already in the scratchpad");