diff --git a/src/buffer.c b/src/buffer.c
index 94e0b2e..22fa136 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3134,7 +3134,7 @@
     }
 
     need_maketitle = FALSE;
-    if (!p_title && !p_icon)
+    if (!p_title && !p_icon && lasttitle == NULL && lasticon == NULL)
 	return;
 
     if (p_title)
diff --git a/src/testdir/test47.in b/src/testdir/test47.in
index d8384de..c87387b 100644
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -2,6 +2,8 @@
 
 STARTTEST
 :so small.vim
+:" Disable the title to avoid xterm keeping the wrong one.
+:set notitle noicon
 /^1
 yG:new
 pkdd:w! Xtest