diff --git a/src/ChangeLog b/src/ChangeLog
index 9231bff6f..6a4f6842c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-29  Pavel Roskin  <proski@gnu.org>
+
+	* dlg.c (frontend_run_dlg): Allow terminating the dialog from
+	the idle handler.
+	From Jindrich Makovicka <makovick@KMLinux.fjfi.cvut.cz>
+	Call change_screen_size() regardless of ncurses version, and let
+	that function decide what to do.
+
 2002-09-28  Pavel Roskin  <proski@gnu.org>
 
 	* background.c (background_attention): Fix calling functions
diff --git a/src/dlg.c b/src/dlg.c
index 8f96aae29..80cbdaea8 100644
--- a/src/dlg.c
+++ b/src/dlg.c
@@ -812,22 +812,24 @@ frontend_run_dlg (Dlg_head *h)
 
     event.x = -1;
     while (h->running) {
-#if defined(HAVE_SLANG) || NCURSES_VERSION_MAJOR >= 4
-	/* It does not work with ncurses before 1.9.9g, it will break */
 	if (winch_flag)
 	    change_screen_size ();
-#endif
-	if (is_idle ()){
+
+	if (is_idle ()) {
 	    if (idle_hook)
 		execute_hooks (idle_hook);
 
-	    while (h->send_idle_msg && is_idle ()){
+	    while (h->send_idle_msg && is_idle ()) {
 		(*h->callback) (h, 0, DLG_IDLE);
 	    }
+
+	    /* Allow terminating the dialog from the idle handler */
+	    if (!h->running)
+		break;
 	}
 
 	update_cursor (h);
-	(*h->callback)(h, 0, DLG_PRE_EVENT);
+	(*h->callback) (h, 0, DLG_PRE_EVENT);
 
 	/* Clear interrupt flag */
 	got_interrupt ();