diff --git a/src/ChangeLog b/src/ChangeLog
index 00811d170..432a9e88a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-10  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* main.c (try_to_select): We do not need to select the item
+	manually in this case, as the X code will do this for us.
+
 Fri Dec 11 00:05:50 1998 Paul Sheer <psheer@obsidian.co.za>
 
 	* syntax.c, slint.c, color.c, color.h: editor now has its
diff --git a/src/main.c b/src/main.c
index e279ffdec..fbfc2c6ce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -373,7 +373,9 @@ void
 try_to_select (WPanel *panel, char *name)
 {
     Xtry_to_select (panel, name);
+#ifndef HAVE_X
     select_item (panel);
+#endif
     display_mini_info (panel);
 }
 
@@ -992,7 +994,7 @@ _do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type)
     panel->dirs_marked = 0;
     panel->total = 0;
     panel->searching = 0;
-    try_to_select (panel, get_parent_dir_name(panel->cwd, olddir));
+    try_to_select (panel, get_parent_dir_name (panel->cwd, olddir));
     load_hint ();
     panel_update_contents (panel);