1 files changed, 8 insertions, 2 deletions

diff --git a/sway/commands/move.c b/sway/commands/move.c
index aede3d6c..b127c89f 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -298,9 +298,15 @@ static struct cmd_results *move_to_position(struct sway_container *container,
 }
 
 static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
-        if (con->type != C_CONTAINER && con->type != C_VIEW) {
+        if (con->type == C_WORKSPACE && con->children->length == 0) {
                 return cmd_results_new(CMD_INVALID, "move",
-                                "Only views and containers can be moved to the scratchpad");
+                                "Can't move an empty workspace to the scratchpad");
+        }
+        if (con->type == C_WORKSPACE) {
+                // Wrap the workspace's children in a container
+                struct sway_container *workspace = con;
+                con = container_wrap_children(con);
+                workspace->layout = L_HORIZ;
         }
         if (con->scratchpad) {
                 return cmd_results_new(CMD_INVALID, "move",