2 files changed, 12 insertions, 1 deletions

diff --git a/sway/commands/move.c b/sway/commands/move.c
index a5b7f661..e0a958bf 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -108,7 +108,7 @@ static void workspace_focus_fullscreen(struct sway_workspace *workspace) {
                 if (focus_ws == workspace) {
                         struct sway_node *new_focus =
                                 seat_get_focus_inactive(seat, &workspace->fullscreen->node);
-                        seat_set_focus(seat, new_focus);
+                        seat_set_raw_focus(seat, new_focus);
                 }
         }
 }
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 9e136d48..791081a8 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -5,9 +5,17 @@
 #include "sway/ipc-server.h"
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
+#include "sway/tree/view.h"
 #include "list.h"
 #include "log.h"
 
+static void rebuild_textures_iterator(struct sway_container *con, void *data) {
+        if (con->view) {
+                view_update_marks_textures(con->view);
+        }
+        container_update_title_textures(con);
+}
+
 static void do_reload(void *data) {
         // store bar ids to check against new bars for barconfig_update events
         list_t *bar_ids = create_list();
@@ -40,6 +48,9 @@ static void do_reload(void *data) {
         list_foreach(bar_ids, free);
         list_free(bar_ids);
 
+        config_update_font_height(true);
+        root_for_each_container(rebuild_textures_iterator, NULL);
+
         arrange_root();
 }