diff --git a/src/systemcmds/nshterm/nshterm.c b/src/systemcmds/nshterm/nshterm.c
index 2341068a22..41d108ffc5 100644
--- a/src/systemcmds/nshterm/nshterm.c
+++ b/src/systemcmds/nshterm/nshterm.c
@@ -91,7 +91,7 @@ nshterm_main(int argc, char *argv[])
     }
 
     /* Set ONLCR flag (which appends a CR for every LF) */
-    uart_config.c_oflag |= (ONLCR | OPOST | OCRNL);
+    uart_config.c_oflag |= (ONLCR | OPOST/* | OCRNL*/);
 
     if ((termios_state = tcsetattr(fd, TCSANOW, &uart_config)) < 0) {
         warnx("ERROR setting baudrate / termios config for %s (tcsetattr)\n", argv[1]);
diff --git a/src/systemcmds/top/top.c b/src/systemcmds/top/top.c
index 0d064a05eb..1ca3fc9281 100644
--- a/src/systemcmds/top/top.c
+++ b/src/systemcmds/top/top.c
@@ -107,9 +107,6 @@ top_main(void)
 
 	float interval_time_ms_inv = 0.f;
 
-	/* Open console directly to grab CTRL-C signal */
-	int console = open("/dev/console", O_NONBLOCK | O_RDONLY | O_NOCTTY);
-
 	/* clear screen */
 	printf("\033[2J");
 
@@ -256,17 +253,24 @@ top_main(void)
 		interval_start_time = new_time;
 
 		/* Sleep 200 ms waiting for user input five times ~ 1s */
-		/* XXX use poll ... */
 		for (int k = 0; k < 5; k++) {
 			char c;
 
-			if (read(console, &c, 1) == 1) {
+			struct pollfd fds;
+			int ret;
+			fds.fd = 0; /* stdin */
+			fds.events = POLLIN;
+			ret = poll(&fds, 1, 0);
+
+			if (ret > 0) {
+
+				read(0, &c, 1);
+
 				switch (c) {
 				case 0x03: // ctrl-c
 				case 0x1b: // esc
 				case 'c':
 				case 'q':
-					close(console);
 					return OK;
 					/* not reached */
 				}
@@ -278,7 +282,5 @@ top_main(void)
 		new_time = hrt_absolute_time();
 	}
 
-	close(console);
-
 	return OK;
 }