1 files changed, 2 insertions, 10 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index ad09b936e0..9b4cd0924b 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1952,15 +1952,7 @@ did_set_title (
 {
   if (starting != NO_SCREEN) {
     maketitle();
-    if (icon) {
-      if (!p_icon) {
-        ui_set_icon(NULL);
-      }
-    } else {
-      if (!p_title) {
-        ui_set_title(NULL);
-      }
-    }
+    resettitle();
   }
 }
 
@@ -3282,7 +3274,7 @@ did_set_string_option (
 
   if (varp == &p_mouse) {
     if (*p_mouse == NUL) {
-      ui_mouse_off();
+      ui_call_mouse_off();
     } else {
       setmouse();  // in case 'mouse' changed
     }