diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 71ea6210d..f82ed61be 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtkdtree.c (gtk_dtree_select_row): This should be also protected 
+	against async notifications.
+
 1999-01-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdnd.c (get_action): Sensitize the menu items based on the
diff --git a/gnome/gtkdtree.c b/gnome/gtkdtree.c
index f2356307e..d5ab40dc1 100644
--- a/gnome/gtkdtree.c
+++ b/gnome/gtkdtree.c
@@ -170,6 +170,7 @@ gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column)
 	if (row == dtree->last_node)
 		return;
 
+	dtree->loading_dir++;
 	dtree->last_node = row;
 
 	gtk_clist_freeze (GTK_CLIST (ctree));
@@ -198,7 +199,8 @@ gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column)
 		g_free (np);
 	}
 #endif
-	
+
+	dtree->loading_dir--;
 	gtk_clist_thaw (GTK_CLIST (ctree));
 }