1 files changed, 4 insertions, 1 deletions

diff --git a/src/textconv.c b/src/textconv.c
index 60f3ba80577..a4de991ef02 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -2138,7 +2138,10 @@ replacement key sequence returned starts a new key sequence and makes
           if (WINDOW_LIVE_P (f->old_selected_window)
               && FRAME_WINDOW_P (f)
               && EQ (XWINDOW (f->old_selected_window)->contents,
-                     buffer))
+                     buffer)
+              /* Always reset the text conversion style of the
+                 selected frame.  */
+              || (f == SELECTED_FRAME ()))
             {
               block_input ();
               reset_frame_state (f);