diff --git a/compositor/shell.c b/compositor/shell.c
index 0f44addd..4ff5306a 100644
--- a/compositor/shell.c
+++ b/compositor/shell.c
@@ -1238,6 +1238,9 @@ shell_destroy(struct wlsc_shell *base)
 {
 	struct wl_shell *shell = container_of(base, struct wl_shell, shell);
 
+	if (shell->child.client)
+		wl_client_destroy(shell->child.client);
+
 	free(shell->screensaver.path);
 	free(shell);
 }
@@ -1296,9 +1299,6 @@ shell_init(struct wlsc_compositor *ec)
 	wlsc_compositor_add_binding(ec, 0, BTN_LEFT, 0,
 				    click_to_activate_binding, ec);
 
-
-
-
 	ec->shell = &shell->shell;
 
 	return 0;