diff --git a/ChangeLog b/ChangeLog
index 015c5788..ddae700d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,11 @@ CVS code -
 	- Change the message for the line wrapping toggle from "Auto
 	  wrap" to "Auto line wrap", to more clearly associate it with
 	  Meta-L. (DLR)
+- nano.c:
+  window_init()
+	- Set keypad() to TRUE regardless of whether PDCurses is being
+	  used, as Meta-X apparently turns it off even under ncurses.
+	  (DLR)
 - nano.h:
 	- Define KEY_SUSPEND as -1 when slang is used, as slang has no
 	  KEY_SUSPEND equivalent.  When nano is compiled with slang
diff --git a/nano.c b/nano.c
index cbdbdb1f..4db19ffc 100644
--- a/nano.c
+++ b/nano.c
@@ -229,19 +229,16 @@ void window_init(void)
     if (bottomwin != NULL)
 	delwin(bottomwin);
 
-    /* Set up the main text window */
+    /* Set up the main text window. */
     edit = newwin(editwinrows, COLS, 2, 0);
 
-    /* And the other windows */
+    /* And the other windows. */
     topwin = newwin(2, COLS, 0, 0);
     bottomwin = newwin(3 - no_help(), COLS, LINES - 3 + no_help(), 0);
 
-#ifdef PDCURSES
-    /* Oops, I guess we need this again.  Moved here so the keypad still
-       works after a Meta-X, for example */
+    /* This is so the keypad still works after a Meta-X, for example. */
     keypad(edit, TRUE);
     keypad(bottomwin, TRUE);
-#endif
 }
 
 #if !defined(DISABLE_MOUSE) && defined(NCURSES_MOUSE_VERSION)