1 files changed, 4 insertions, 1 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 0d4aa104..6bb4db0b 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -281,7 +281,10 @@ struct cmd_results *handle_command(char *_exec) {
                                         seat = sway_input_manager_get_default_seat(input_manager);
                                 }
                                 if (seat) {
-                                        config->handler_context.current_container = seat->focus;
+                                        config->handler_context.current_container =
+                                                (seat->has_focus ?
+                                                 sway_seat_get_focus(seat, &root_container) :
+                                                 NULL);
                                         struct cmd_results *res = handler->handle(argc-1, argv+1);
                                         if (res->status != CMD_SUCCESS) {
                                                 free_argv(argc, argv);