1 files changed, 2 insertions, 5 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 177c54ab..6e74a442 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -822,11 +822,8 @@ static bool cmd_workspace(struct sway_config *config, int argc, char **argv) {
                 }
                 if (strcasecmp(argv[0], "back_and_forth") == 0) {
                         if (prev_workspace_name) {
-                                if (workspace_by_name(prev_workspace_name)) {
-                                        workspace_switch(workspace_by_name(prev_workspace_name));
-                                } else {
-                                        workspace_switch(workspace_create(prev_workspace_name));
-                                }
+                                swayc_t *ws = workspace_by_name(prev_workspace_name);
+                                workspace_switch(ws ? ws : workspace_create(prev_workspace_name));
                         }
                         return true;
                 }