diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index a3f095c4db96..bf8f0da15fb7 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -61,7 +61,7 @@ Names may be preceded by "/dev/".
 While running in interactive mode, all user input is discarded except for:
 .Pp
 .Bl -tag -width "XXXX" -compact
-.It Sy "<control-Q>"
+.It Sy "<control-G>"
 Exit
 .Nm watch .
 .It Sy "<control-W>"
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 50094e7fb93c..f544c0ebb2bb 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -96,11 +96,11 @@ set_tty()
 	ioctl(std_in, TIOCGETC, &tco);
 	sgn = sgo;
 	tc = tco;
-	sgn.sg_flags |= RAW;
+	sgn.sg_flags |= CBREAK;
 	sgn.sg_flags &= ~ECHO;
 	ospeed = sgo.sg_ospeed;
-	tc.t_intrc = 17;	/* ^Q */
-	tc.t_quitc = 17;	/* ^Q */
+	tc.t_intrc = 07;	/* ^G */
+	tc.t_quitc = 07;	/* ^G */
 	ioctl(std_in, TIOCSETP, &sgn);
 	ioctl(std_in, TIOCSETC, &tc);
 }