diff --git a/ChangeLog b/ChangeLog
index ef8e10378c..15acf95943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-29  David Hampton  <hampton@employees.org>
+
+	* gnc-tree-model-commodity.c: Andreas Köhler's patch to fix
+	commodity editor warnings/crash.
+
 2006-01-29  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/report/utility-reports/welcome-to-gnucash.scm: register
diff --git a/src/gnome-utils/gnc-tree-model-commodity.c b/src/gnome-utils/gnc-tree-model-commodity.c
index 082c574097..001eefdff1 100644
--- a/src/gnome-utils/gnc-tree-model-commodity.c
+++ b/src/gnome-utils/gnc-tree-model-commodity.c
@@ -1052,7 +1052,7 @@ gnc_tree_model_commodity_path_changed (GncTreeModelCommodity *model,
   GtkTreeIter iter;
 
   debug_path(ENTER, path);
-  if (gtk_tree_path_up (path)) {
+  if (gtk_tree_path_up (path) && gtk_tree_path_get_depth (path) > 0) {
     debug_path(DEBUG, path);
     gtk_tree_model_get_iter (GTK_TREE_MODEL(model), &iter, path);
     DEBUG("iter %s", iter_to_string(&iter));