diff --git a/man/tkremind.1 b/man/tkremind.1
index d4117496..5908fa35 100644
--- a/man/tkremind.1
+++ b/man/tkremind.1
@@ -235,6 +235,22 @@ press \fBApply Options\fR to put them into effect, \fBSave Options\fR
 to put them into effect and save them in $HOME/.tkremindrc, or
 \fBCancel\fR to cancel any changes you made.
 
+.SH KEYBOARD SHORTCUTS
+\fBTkRemind\fR's main window includes the following keyboard shortcuts:
+
+.TP
+.B Ctrl-Q
+Quit
+.TP
+.B Left Arrow
+Previous Month
+.TP
+.B Right Arrow
+Next Month
+.TP
+.B Home
+Today
+
 .SH ODDS AND ENDS
 \fBTkRemind\fR performs some basic consistency checks when you add or
 preview a reminder.  However, if you edit a reminder in the previewer,
@@ -268,7 +284,7 @@ for \fBTkRemind\fR (for example).
 script file.  It also places special comments in the reminder
 file to store additional state.  You can certainly mix
 "hand-crafted" reminders with reminders created by \fBTkRemind\fR
-if you are awared of the following rules and limitations:
+if you are aware of the following rules and limitations:
 .TP
 o
 Do not use the \fBTAG\fR keyword in hand-crafted reminders.
diff --git a/scripts/tkremind b/scripts/tkremind
index 23d60e2a..3cf8d553 100755
--- a/scripts/tkremind
+++ b/scripts/tkremind
@@ -435,6 +435,11 @@ proc CreateCalWindow { dayNames } {
     wm iconname . ""
     wm protocol . WM_DELETE_WINDOW Quit
     wm deiconify .
+    bind . <Control-KeyPress-q> Quit
+    bind . <KeyPress-Left> ".b.prev invoke"
+    bind . <KeyPress-Right> ".b.next invoke"
+    bind . <KeyPress-Home> ".b.this invoke"
+
     if {$Option(StartIconified)} {
 	wm iconify .
     }
@@ -1241,6 +1246,9 @@ proc CreateModifyDialog {w day firstDay args} {
     }
 
     bind $w <KeyPress-Escape> "$w.but1 invoke"
+    if {$nbut >= 2} {
+	bind $w.entry <KeyPress-Return> "$w.but2 invoke"
+    }
     set ModifyDialogResult 0
 
     # Center the window on the root