diff --git a/ChangeLog b/ChangeLog
index 3d03ec1..b2c46a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Key:
 v0.5dev (ongoing development)
  - Remove deprecated CFontz633 driver. Use CFontzPacket with Model=633 instead!
  + new driver: glcd unified graphic display driver (M. Dolze)
+ * curses: Fix missed keystrokes (from Debian)
 
 v0.5.5
  + sed1330 driver: Add support for HG25504 (L. Lagendijk)
diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c
index a30e91a..4a412a8 100644
--- a/server/drivers/curses_drv.c
+++ b/server/drivers/curses_drv.c
@@ -606,11 +606,12 @@ curses_flush (Driver *drvthis)
 	PrivateData *p = drvthis->private_data;
 	int c;
 
-	if ((c = getch()) != ERR)
+	if ((c = getch()) != ERR) {
 		if (c == 0x0C) {	/* ^L restores screen */
 			curses_restore_screen(drvthis);
-			ungetch(c);
 		}
+		ungetch(c);
+	}
 
 	if (p->drawBorder)
 		curses_wborder(drvthis);