diff --git a/src/channel.c b/src/channel.c
index 41d19f5..3a80748 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3181,7 +3181,13 @@
 
 	    if (r && nread > 0)
 		return CW_READY;
-	    if (r == 0)
+
+	    if (channel->ch_named_pipe)
+	    {
+		DisconnectNamedPipe((HANDLE)fd);
+		ConnectNamedPipe((HANDLE)fd, NULL);
+	    }
+	    else if (r == 0)
 		return CW_ERROR;
 
 	    /* perhaps write some buffer lines */
@@ -3813,7 +3819,16 @@
 	if (part == PART_SOCK)
 	    res = sock_write(fd, (char *)buf, len);
 	else
+	{
 	    res = fd_write(fd, (char *)buf, len);
+#ifdef WIN32
+	    if (channel->ch_named_pipe && res < 0)
+	    {
+		DisconnectNamedPipe((HANDLE)fd);
+		ConnectNamedPipe((HANDLE)fd, NULL);
+	    }
+#endif
+	}
 	if (res < 0 && (errno == EWOULDBLOCK
 #ifdef EAGAIN
 			|| errno == EAGAIN
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 960a85e..ea7d4b1 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -644,8 +644,7 @@
 
 func Test_terminal_no_cmd()
   " Does not work on Mac.
-  " Todo: make this work on Win32 again
-  if has('mac') || has('win32')
+  if has('mac')
     return
   endif
   let buf = term_start('NONE', {})
diff --git a/src/version.c b/src/version.c
index 91b3542..a4decba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    796,
+/**/
     795,
 /**/
     794,