diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index c58cdd470..2b2a66f0d 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,11 @@
 1999-05-26  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
+	* gscreen.c (panel_fill_panel_icons): Add a hack to work around
+	gnome-libs/gnome-icon-list bug that did not reset the proper
+	values.  A fix will be available in gnome-libs-1.0.10.
+
+	Fixes bug #1338.
+
 	* gcmd.c (gnome_close_panel): Remove filter_w
 
 	* gscreen.c (x_filter_changed): Update nothing.
diff --git a/gnome/gcmd.c b/gnome/gcmd.c
index 6176259d7..088f45a3f 100644
--- a/gnome/gcmd.c
+++ b/gnome/gcmd.c
@@ -701,8 +701,8 @@ gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
 			gtk_label_set_text (GTK_LABEL (panel->status), panel->filter);
 		
 		gnome_entry_save_history (GNOME_ENTRY (entry));
-		reread_cmd ();
 		x_filter_changed (panel);
+		reread_cmd ();
 		break;
 	}
 	gtk_widget_destroy (filter_dlg);
diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index 1895ff586..c041ff014 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -243,6 +243,18 @@ panel_fill_panel_icons (WPanel *panel)
 	gnome_icon_list_freeze (icons);
 	gnome_icon_list_clear (icons);
 
+	/*
+	 * HACK_BEGIN:
+	 *    Temporary hack for pre-gnome-libs-1.0.10
+	 *
+	 *    Remove after wildely deployed
+	 */
+	icons->last_selected = 0;
+	icons->last_clicked = 0;
+	/*
+	 * HACK_END:
+	 */
+	 
 	for (i = 0; i < top; i++){
 		file_entry *fe = &panel->dir.list [i];
 		int p;