diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0654b08..f554124b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,13 @@
 ### Deprecated
 ### Removed
 ### Fixed
+
+* Other output (key presses, query replies etc) being mixed with paste
+  data, both interactive pastes and OSC-52 ([#2307][2307]).
+
+[2307]: https://codeberg.org/dnkl/foot/issues/2307
+
+
 ### Security
 ### Contributors
 
diff --git a/terminal.c b/terminal.c
index ac7922a7..8eafbcbe 100644
--- a/terminal.c
+++ b/terminal.c
@@ -120,7 +120,10 @@ term_to_slave(struct terminal *term, const void *data, size_t len)
         return false;
     }
 
-    if (tll_length(term->ptmx_buffers) > 0 || term->is_sending_paste_data) {
+    if (unlikely(tll_length(term->ptmx_buffers) > 0 ||
+                 term->is_sending_paste_data ||
+                 tll_length(term->ptmx_paste_buffers) > 0))
+    {
         /*
          * Don't even try to send data *now* if there's queued up
          * data, since that would result in events arriving out of