diff --git a/ChangeLog b/ChangeLog
index cf70dff37a..55187d2436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-09  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_move_cursor_up_down): disable
+	don't move cursor case for SELECTION_NONE. (#371756, John Ellis).
+
 2006-11-09  Carlos Garnacho  <carlosg@gnome.org>
 
 	* gtk/gtkpathbar.c (on_slider_unmap): Fix parenthesis confusion.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 44103bc2f6..2f6a56e405 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9506,8 +9506,11 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
 
   selection_count = gtk_tree_selection_count_selected_rows (tree_view->priv->selection);
 
-  if (selection_count == 0 && !tree_view->priv->ctrl_pressed)
+  if (selection_count == 0
+      && tree_view->priv->selection->type != GTK_SELECTION_NONE
+      && !tree_view->priv->ctrl_pressed)
     {
+      /* Don't move the cursor, but just select the current node */
       new_cursor_tree = cursor_tree;
       new_cursor_node = cursor_node;
     }