diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c19a0e..47ca1107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,15 @@
 
 ## Unreleased
 ### Added
+
+* Workaround for Sway bug [#6960][sway-6960]: scrollback search and
+  the OSC-555 (“flash”) escape sequence leaves dimmed (search )and
+  yellow (flash) artifacts ([#1046][1046]).
+
+[sway-6960]: https://github.com/swaywm/sway/issues/6960
+[1046]: https://codeberg.org/dnkl/foot/issues/1046
+
+
 ### Changed
 ### Deprecated
 ### Removed
diff --git a/search.c b/search.c
index 09b59d50..72c589f2 100644
--- a/search.c
+++ b/search.c
@@ -116,6 +116,11 @@ search_cancel_keep_selection(struct terminal *term)
 
     term_xcursor_update(term);
     render_refresh(term);
+
+    /* Work around Sway bug - unmapping a sub-surface does not damage
+     * the underlying surface */
+    term_damage_margins(term);
+    term_damage_view(term);
 }
 
 void
@@ -795,7 +800,6 @@ execute_binding(struct seat *seat, struct terminal *term,
             grid->view = ensure_view_is_allocated(
                 term, term->search.original_view);
         }
-        term_damage_view(term);
         search_cancel(term);
         return true;
 
diff --git a/terminal.c b/terminal.c
index 7d230cdf..9199aa31 100644
--- a/terminal.c
+++ b/terminal.c
@@ -355,8 +355,12 @@ fdm_flash(struct fdm *fdm, int fd, int events, void *data)
             (unsigned long long)expiration_count);
 
     term->flash.active = false;
-    term_damage_view(term);
     render_refresh(term);
+
+    /* Work around Sway bug - unmapping a sub-surface does not damage
+     * the underlying surface */
+    term_damage_margins(term);
+    term_damage_view(term);
     return true;
 }