diff --git a/edit/ChangeLog b/edit/ChangeLog
index b6622d6dd..2f2091c66 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-12  Pavel Roskin  <proski@gnu.org>
+
+	* editcmd.c (edit_raw_key_query): Use straight widget order.
+	(edit_completion_dialog): Likewise.
+	* editwidget.c (edit): Likewise.
+
 2003-09-07  Pavel Roskin  <proski@gnu.org>
 
 	* edit.h: Get rid of WIDGET_COMMAND, update all dependencies.
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 6775ecdd6..882f45aee 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -550,14 +550,14 @@ edit_raw_key_query (char *heading, char *query, int cancel)
     struct Dlg_head *raw_dlg =
 	create_dlg (0, 0, 7, w, dialog_colors, raw_callback,
 		    NULL, heading,
-		    DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB | DLG_REVERSE);
+		    DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB);
+    add_widget (raw_dlg,
+		input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0));
+    add_widget (raw_dlg, label_new (3 - cancel, 2, query));
     if (cancel)
 	add_widget (raw_dlg,
 		    button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON,
 				_("Cancel"), 0));
-    add_widget (raw_dlg, label_new (3 - cancel, 2, query));
-    add_widget (raw_dlg,
-		input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0));
     run_dlg (raw_dlg);
     w = raw_dlg->ret_value;
     destroy_dlg (raw_dlg);
@@ -2756,7 +2756,7 @@ edit_completion_dialog (WEdit *edit, int max_len, int word_len,
     compl_dlg =
 	create_dlg (start_y, start_x, compl_dlg_h, compl_dlg_w,
 		    dialog_colors, NULL, "[Completion]", NULL,
-		    DLG_COMPACT | DLG_REVERSE);
+		    DLG_COMPACT);
 
     /* create the listbox */
     compl_list =
diff --git a/edit/editwidget.c b/edit/editwidget.c
index 75f11e2a7..77da67363 100644
--- a/edit/editwidget.c
+++ b/edit/editwidget.c
@@ -187,7 +187,7 @@ edit (const char *_file, int line)
     /* Create a new dialog and add it widgets to it */
     edit_dlg =
 	create_dlg (0, 0, LINES, COLS, NULL, edit_dialog_callback,
-		    "[Internal File Editor]", NULL, DLG_WANT_TAB | DLG_REVERSE);
+		    "[Internal File Editor]", NULL, DLG_WANT_TAB);
 
     init_widget (&(wedit->widget), 0, 0, LINES - 1, COLS,
 		 (callback_fn) edit_callback,
@@ -206,11 +206,10 @@ edit (const char *_file, int line)
 	break;
     }
     edit_menubar = menubar_new (0, 0, COLS, EditMenuBar, N_menus);
-    add_widget (edit_dlg, wedit);
-
-    add_widget (edit_dlg, edit_menubar);
 
     add_widget (edit_dlg, edit_bar);
+    add_widget (edit_dlg, wedit);
+    add_widget (edit_dlg, edit_menubar);
 
     run_dlg (edit_dlg);