diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index d1c93733c0..195b82dcd4 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3458,7 +3458,6 @@ void resettitle(void)
 {
   ui_call_set_icon(cstr_as_string(lasticon));
   ui_call_set_title(cstr_as_string(lasttitle));
-  ui_flush();
 }
 
 #if defined(EXITFREE)
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 02b63d16b7..35e1b55494 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -4840,9 +4840,6 @@ static void ex_stop(exarg_T *eap)
   ui_call_suspend();
   ui_flush();
 
-  maketitle();
-  resettitle();  // force updating the title
-  ui_refresh();  // may have resized window
   apply_autocmds(EVENT_VIMRESUME, NULL, NULL, false, NULL);
 }
 
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 45959b7b67..47e286cf51 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -15,7 +15,7 @@
 #include "nvim/api/ui.h"
 #include "nvim/ascii.h"
 #include "nvim/autocmd.h"
-#include "nvim/buffer_defs.h"
+#include "nvim/buffer.h"
 #include "nvim/cursor_shape.h"
 #include "nvim/drawscreen.h"
 #include "nvim/ex_getln.h"
@@ -348,6 +348,7 @@ void ui_attach_impl(UI *ui, uint64_t chanid)
 
   uis[ui_count++] = ui;
   ui_refresh_options();
+  resettitle();
 
   for (UIExtension i = kUIGlobalCount; (int)i < kUIExtCount; i++) {
     ui_set_ext_option(ui, i, ui->ui_ext[i]);
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index e1ae76badf..65e291966f 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -117,6 +117,12 @@ local function screen_tests(linegrid)
       screen:expect(function()
         eq(expected, screen.title)
       end)
+      screen:detach()
+      screen.title = nil
+      screen:attach()
+      screen:expect(function()
+        eq(expected, screen.title)
+      end)
     end)
   end)
 
@@ -128,6 +134,12 @@ local function screen_tests(linegrid)
       screen:expect(function()
         eq(expected, screen.icon)
       end)
+      screen:detach()
+      screen.icon = nil
+      screen:attach()
+      screen:expect(function()
+        eq(expected, screen.icon)
+      end)
     end)
   end)