1 files changed, 5 insertions, 0 deletions

diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 5fde8129..362dcd1b 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -184,6 +184,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                 bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
                 struct sway_seat *seat = config->handler_context.seat;
                 struct sway_workspace *current = seat_get_focused_workspace(seat);
+                if (!current) {
+                        return cmd_results_new(CMD_FAILURE, "workspace",
+                                "No workspace to switch from");
+                }
+
                 struct sway_workspace *ws = NULL;
                 if (strcasecmp(argv[0], "number") == 0) {
                         if (argc < 2) {