diff --git a/sway/commands/move.c b/sway/commands/move.c
index 959e5bfb..876a5616 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -537,7 +537,8 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
 	struct sway_node *focus = seat_get_focus(seat);
 
 	// move container
-	if (container->scratchpad) {
+	if (container_is_scratchpad_hidden_or_child(container)) {
+		container_detach(container);
 		root_scratchpad_show(container);
 	}
 	switch (destination->type) {