diff --git a/ChangeLog b/ChangeLog
index 9a0ee1b0f9c766d66bd7f3fd60fdd8f6ae6ffb21..982d757c542ae3dbe5d2d81408b2e52c97abd6c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,10 @@ CVS code -
   do_toggle()
 	- Rewrote function to allow NOHELP toggle to wotk on systems
 	  without a working resizewin().  New function window_init().
+  mouse_init()
+	- Add keypad only if mouse support is on, otherwise mouse doesn't
+	  work.  I guess you have to choose between having the mouse and
+	  having a working keypad for the time being (thank god for Meta-m).
 - winio.c:
   total_refresh()
 	- Added titlebar() call.
diff --git a/nano.c b/nano.c
index 3394731e53b9192300293f15a4d00da87fe37c40..bb61117c4038ea50538d2a69918bf67375872deb 100644
--- a/nano.c
+++ b/nano.c
@@ -1358,11 +1358,17 @@ void mouse_init(void)
 #ifndef NANO_SMALL
 #ifdef NCURSES_MOUSE_VERSION
     if (ISSET(USE_MOUSE)) {
+	keypad(edit, TRUE);
+	keypad(bottomwin, TRUE);
+
 	mousemask(BUTTON1_RELEASED, NULL);
 	mouseinterval(50);
+
     }
     else {
 	mousemask(0, NULL);
+	keypad(edit, FALSE);
+	keypad(bottomwin, FALSE);
     }
 #endif
 #endif
diff --git a/po/nano.pot b/po/nano.pot
index 7653173d782e58f5095934ef1d87833922d3ea69..9b26d6811cadcf0a8e4e9d08c256b8e9ed7d42fd 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-14 23:37-0400\n"
+"POT-Creation-Date: 2000-09-15 11:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -675,52 +675,52 @@ msgstr ""
 msgid "Cannot move bottom win"
 msgstr ""
 
-#: nano.c:1631
+#: nano.c:1637
 #, c-format
 msgid "%s enable/disable"
 msgstr ""
 
-#: nano.c:1643
+#: nano.c:1649
 msgid "enabled"
 msgstr ""
 
-#: nano.c:1644
+#: nano.c:1650
 msgid "disabled"
 msgstr ""
 
-#: nano.c:1872
+#: nano.c:1878
 msgid "Main: set up windows\n"
 msgstr ""
 
-#: nano.c:1879
+#: nano.c:1885
 msgid "Main: bottom win\n"
 msgstr ""
 
-#: nano.c:1885
+#: nano.c:1891
 msgid "Main: open file\n"
 msgstr ""
 
-#: nano.c:1919
+#: nano.c:1925
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:1943
+#: nano.c:1949
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:1976
+#: nano.c:1982
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2024
+#: nano.c:2030
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2050
+#: nano.c:2056
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr ""