diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index a6e04fa7c52ce7fa3ba57a70ad640b185ac999f9..6163216474383e08d189cbb81641a9799a6b8c0b 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -875,6 +875,11 @@ tree_expander_shortcut_cb (GtkWidget *widget,
     char *action;
     guint keyval = GPOINTER_TO_INT (user_data);
 
+    if (!self->expand_as_a_tree)
+    {
+        return FALSE;
+    }
+
     /* Hack to find the focus item. */
     child = gtk_root_get_focus (gtk_widget_get_root (widget));
     while (child != NULL && !NAUTILUS_IS_VIEW_CELL (child))