1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index d9ca82784f..0bb69d000b 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -659,6 +659,9 @@ void os_exit(int r)
 
   if (ui_client_channel_id) {
     ui_client_stop();
+    if (r == 0) {
+      r = ui_client_exit_status;
+    }
   } else {
     ui_flush();
     ui_call_stop();