diff --git a/src/ChangeLog b/src/ChangeLog
index b429c0040..63bc0ca40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,16 +1,19 @@
 2003-09-12  Pavel Roskin  <proski@gnu.org>
 
+	* main.c (setup_panels_and_run_mc): Use straight widget order in
+	midnight_dlg.  Select initial panel by dlg_select_widget().
+
 	* menu.h (WMenu): Save pointer to the previous widget, not its
 	number.  Adjust all dependencies.
 	* menu.c (menubar_finish): Restore focus on the saved widget.
 	* dlg.c (dlg_item_number): Remove, it's unused now.
 	(dlg_select_nth_widget): Likewise.
 
-	* help.c (interactive_display): User straight widget order.
+	* help.c (interactive_display): Use straight widget order.
 
 	* complete.c (complete_engine): Don't need DLG_REVERSE.
 	* widget.c (show_hist): Likewise.
-	* view.c (view): User straight widget order.
+	* view.c (view): Use straight widget order.
 
 	* dlg.h: Replace DLG_BACKWARD to DLG_REVERSE with a better
 	defined meaning.  Make it default to populate dialogs from the
diff --git a/src/main.c b/src/main.c
index 3498c65c1..2a1a60cb2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1669,28 +1669,23 @@ load_hint (int force)
 static void
 setup_panels_and_run_mc (void)
 {
-    int first, second;
-
     xtoolkit_panel_setup ();
+
+    add_widget (midnight_dlg, the_menubar);
+    add_widget (midnight_dlg, get_panel_widget (0));
+    add_widget (midnight_dlg, get_panel_widget (1));
     add_widget (midnight_dlg, the_hint);
     load_hint (1);
     add_widget (midnight_dlg, cmdline);
     add_widget (midnight_dlg, the_prompt);
     add_widget (midnight_dlg, the_bar);
-
-    if (boot_current_is_left) {
-	first = 1;
-	second = 0;
-    } else {
-	first = 0;
-	second = 1;
-    }
-    add_widget (midnight_dlg, get_panel_widget (first));
-    add_widget (midnight_dlg, get_panel_widget (second));
-    add_widget (midnight_dlg, the_menubar);
-
     init_labels ();
 
+    if (boot_current_is_left)
+	dlg_select_widget (midnight_dlg, get_panel_widget (0));
+    else
+	dlg_select_widget (midnight_dlg, get_panel_widget (1));
+
     /* Run the Midnight Commander if no file was specified in the command line */
     run_dlg (midnight_dlg);
 }
@@ -1757,7 +1752,7 @@ do_nc (void)
 
     midnight_dlg =
 	create_dlg (0, 0, LINES, COLS, midnight_colors, midnight_callback,
-		    "[main]", NULL, DLG_HAS_MENUBAR | DLG_WANT_IDLE | DLG_REVERSE);
+		    "[main]", NULL, DLG_HAS_MENUBAR | DLG_WANT_IDLE);
 
     /* Check if we were invoked as an editor or file viewer */
     if (mc_maybe_editor_or_viewer ())