diff --git a/arch/sim/src/up_head.c b/arch/sim/src/up_head.c
index 28ca4a2745..43bc256b1a 100644
--- a/arch/sim/src/up_head.c
+++ b/arch/sim/src/up_head.c
@@ -50,6 +50,8 @@
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 
+#include "up_internal.h"
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -86,6 +88,9 @@ int main(int argc, char **argv, char **envp)
       os_start();
     }
 
+  /* Restore the original terminal mode and return the exit code */
+
+  simuart_teriminate();
   return retcode;
 }
 
diff --git a/arch/sim/src/up_internal.h b/arch/sim/src/up_internal.h
index 80c9cc81a8..257efa8d5a 100644
--- a/arch/sim/src/up_internal.h
+++ b/arch/sim/src/up_internal.h
@@ -227,6 +227,7 @@ void simuart_start(void);
 int simuart_putc(int ch);
 int simuart_getc(void);
 bool simuart_checkc(void);
+void simuart_teriminate(void);
 
 /* up_uartwait.c **********************************************************/
 
diff --git a/arch/sim/src/up_simuart.c b/arch/sim/src/up_simuart.c
index 7f940a9a94..fd94fada9e 100644
--- a/arch/sim/src/up_simuart.c
+++ b/arch/sim/src/up_simuart.c
@@ -39,6 +39,7 @@
 
 #include <stdbool.h>
 #include <unistd.h>
+#include <string.h>
 #include <termios.h>
 #include <pthread.h>
 
@@ -82,6 +83,13 @@ void simuart_initialize(void);
 void simuart_post(void);
 void simuart_wait(void);
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct termios g_cooked;
+
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -92,17 +100,23 @@ void simuart_wait(void);
 
 static void setrawmode(void)
 {
-  struct termios term;
+  struct termios raw;
 
-  (void)tcgetattr(0, &term);
+  /* Get the current stdin terminal mode */
 
-  term.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
-  term.c_oflag &= ~OPOST;
-  term.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
-  term.c_cflag &= ~(CSIZE | PARENB);
-  term.c_cflag |= CS8;
+  (void)tcgetattr(0, &g_cooked);
 
-  (void)tcsetattr(0, TCSANOW, &term);
+  /* Switch to raw mode */
+
+  memcpy(&raw, &g_cooked, sizeof(struct termios));
+
+  raw.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+  raw.c_oflag &= ~OPOST;
+  raw.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+  raw.c_cflag &= ~(CSIZE | PARENB);
+  raw.c_cflag |= CS8;
+
+  (void)tcsetattr(0, TCSANOW, &raw);
 }
 
 /****************************************************************************
@@ -304,3 +318,13 @@ bool simuart_checkc(void)
   return g_uarthead != g_uarttail;
 }
 
+/****************************************************************************
+ * Name: simuart_teriminate
+ ****************************************************************************/
+
+void simuart_teriminate(void)
+{
+  /* Restore the original terminal mode */
+
+  (void)tcsetattr(0, TCSANOW, &g_cooked);
+}