2 files changed, 4 insertions, 2 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 778108b4..c3cf6c64 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -79,7 +79,7 @@ struct sway_container *container_destroy(struct sway_container *cont) {
                 list_free(cont->marks);
         }
         if (parent) {
-                container_remove_child(cont);
+                parent = container_remove_child(cont);
         }
         if (cont->name) {
                 free(cont->name);
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 32e6a77c..588ceb2d 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -110,9 +110,11 @@ struct sway_container *container_reap_empty(struct sway_container *container) {
         while (container->children->length == 0) {
                 if (container->type == C_WORKSPACE) {
                         if (!workspace_is_visible(container)) {
+                                struct sway_container *parent = container->parent;
                                 container_workspace_destroy(container);
+                                return parent;
                         }
-                        break;
+                        return container;
                 } else if (container->type == C_CONTAINER) {
                         struct sway_container *parent = container->parent;
                         container_destroy(container);