diff --git a/src/channel.c b/src/channel.c
index 84dfcf7..f4dc323 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2868,6 +2868,11 @@
      * died.  Don't close the channel right away, it may be the wrong moment
      * to invoke callbacks. */
     channel->ch_to_be_closed = TRUE;
+
+#ifdef FEAT_GUI
+    /* Stop listening to GUI events right away. */
+    channel_gui_unregister(channel);
+#endif
 }
 
     static void
diff --git a/src/version.c b/src/version.c
index 2a259a5..80793f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1850,
+/**/
     1849,
 /**/
     1848,