1 files changed, 2 insertions, 1 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 8baa616d..93d1effe 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -160,7 +160,8 @@ static struct sway_node *node_get_in_direction_tiling(
         // Check a different output
         struct sway_output *output = container->workspace->output;
         struct sway_output *new_output = output_get_in_direction(output, dir);
-        if (new_output) {
+        if ((config->focus_wrapping != WRAP_WORKSPACE ||
+                                container->node.type == N_WORKSPACE) && new_output) {
                 return get_node_in_output_direction(new_output, dir);
         }