Merge pull request #2998 from orestisf1993/issue-2990

[i3/i3] / src / move.c

diff --git a/src/move.c b/src/move.c
index 70c8c7885521c52724eaa29c1ec3724ad535ed85..97ca6d40b42423a07582d44f3ade0f9001d7ef7f 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -118,7 +118,7 @@ static void move_to_output_directed(Con *con, direction_t direction) {
     attach_to_workspace(con, ws, direction);
 
     /* fix the focus stack */
-    con_focus(con);
+    con_activate(con);
 
     /* force re-painting the indicators */
     FREE(con->deco_render_params);
@@ -248,7 +248,8 @@ void tree_move(Con *con, int direction) {
                         ? AFTER
                         : BEFORE);
         insert_con_into(con, target, position);
-    } else if (con->parent->parent->type == CT_WORKSPACE &&
+    } else if (!next &&
+               con->parent->parent->type == CT_WORKSPACE &&
                con->parent->layout != L_DEFAULT &&
                con_num_children(con->parent) == 1) {
         /* Con is the lone child of a non-default layout container at the edge