diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index 1c8b1321d..36f19cee3 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -1389,7 +1389,13 @@ panel_create_icon_display (WPanel *panel)
 
 	icon_field = GNOME_ICON_LIST (gnome_icon_list_new ());
 	gnome_icon_list_set_separators (icon_field, " /-_.");
+	gnome_icon_list_set_row_spacing (icon_field, 2);
+	gnome_icon_list_set_col_spacing (icon_field, 2);
+	gnome_icon_list_set_icon_border (icon_field, 2);
+	gnome_icon_list_set_text_spacing (icon_field, 2);
 	
+	icon_field->desired_text_width = 100;
+		
 	gnome_icon_list_set_selection_mode (icon_field, GTK_SELECTION_MULTIPLE);
 
 	gtk_signal_connect (GTK_OBJECT (icon_field), "select_icon",
diff --git a/gnome/gwidget.c b/gnome/gwidget.c
index d23ca5643..4f5fff4ca 100644
--- a/gnome/gwidget.c
+++ b/gnome/gwidget.c
@@ -260,7 +260,8 @@ entry_release (GtkEditable *entry, GdkEvent *event, WInput *in)
 	in->point = entry->current_pos;
 	in->mark  = (entry->current_pos == entry->selection_start_pos) ?
 		entry->selection_end_pos : entry->selection_start_pos;
-	in->first = 1;
+	if (in->point != in->mark)
+		in->first = 1;
 }
 
 int
diff --git a/src/ext.h b/src/ext.h
index 1d86c4156..a15f59d17 100644
--- a/src/ext.h
+++ b/src/ext.h
@@ -12,7 +12,7 @@ void flush_extension_file (void);
 #    define MC_USER_EXT "mc.ext"
 #    define MC_LIB_EXT  "mc.ext"
 #else
-#    define MC_USER_EXT ".mc/ext"
+#    define MC_USER_EXT ".mc/ext-n"
 #    define MC_LIB_EXT  "mc.ext"
 #endif
 #endif
diff --git a/src/widget.c b/src/widget.c
index ca2074b8b..f6783404c 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -1536,7 +1536,10 @@ is_in_input_map (WInput *in, int c_code)
 static void
 port_region_marked_for_delete (WInput *in)
 {
+	if (in->first == 1 && (in->point == in->mark))
+		in->point = strlen (in->buffer);
 	kill_region (in);
+	in->first = 0;
 }
 #else
 static void
@@ -1731,7 +1734,6 @@ input_new (int y, int x, int color, int len, char *def_text, char *tkname)
 
     strcpy (in->buffer, def_text);
     in->point = strlen (in->buffer);
-    in->first = 1;
     return in;
 }