diff --git a/src/term.c b/src/term.c
index f4f54e2..d3d0581 100644
--- a/src/term.c
+++ b/src/term.c
@@ -5708,30 +5708,20 @@
 		&& key_name[0] == KS_EXTRA
 	    )
 	{
-	    int did_aucmd = FALSE;
-
 	    if (key_name[1] == KE_FOCUSGAINED && !focus_state)
 	    {
-		did_aucmd = apply_autocmds(EVENT_FOCUSGAINED,
-						    NULL, NULL, FALSE, curbuf);
+		ui_focus_change(TRUE);
 		did_cursorhold = TRUE;
 		focus_state = TRUE;
 		key_name[1] = (int)KE_IGNORE;
 	    }
 	    else if (key_name[1] == KE_FOCUSLOST && focus_state)
 	    {
-		did_aucmd = apply_autocmds(EVENT_FOCUSLOST,
-						    NULL, NULL, FALSE, curbuf);
+		ui_focus_change(FALSE);
 		did_cursorhold = TRUE;
 		focus_state = FALSE;
 		key_name[1] = (int)KE_IGNORE;
 	    }
-	    if (did_aucmd && (State & (NORMAL | INSERT | TERMINAL)))
-	    {
-		// in case a message was displayed: reposition the cursor
-		setcursor();
-		out_flush();
-	    }
 	}
 #endif
 
diff --git a/src/ui.c b/src/ui.c
index ed56527..3f4304f 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1101,7 +1101,6 @@
     return row;
 }
 
-#if defined(FEAT_GUI) || defined(MSWIN) || defined(PROTO)
 /*
  * Called when focus changed.  Used for the GUI or for systems where this can
  * be done in the console (Win32).
@@ -1164,7 +1163,6 @@
 	maketitle();
 #endif
 }
-#endif
 
 #if defined(HAVE_INPUT_METHOD) || defined(PROTO)
 /*
diff --git a/src/version.c b/src/version.c
index 319e65e..cfc9290 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2348,
+/**/
     2347,
 /**/
     2346,