diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index dd6251eaa..25638d60c 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -774,7 +774,10 @@ static void
 nautilus_files_view_select_first (NautilusFilesView *self)
 {
     NautilusFilesViewPrivate *priv = nautilus_files_view_get_instance_private (self);
-    nautilus_list_base_set_cursor (priv->list_base, 0, TRUE, TRUE);
+    if (g_list_model_get_n_items (G_LIST_MODEL (priv->model)) > 0)
+    {
+        nautilus_list_base_set_cursor (priv->list_base, 0, TRUE, TRUE);
+    }
 }
 
 static void
@@ -4451,11 +4454,14 @@ static void
 display_pending_files (NautilusFilesView *view)
 {
     NautilusFilesViewPrivate *priv = nautilus_files_view_get_instance_private (view);
-    g_autoptr (GtkBitset) selection = gtk_selection_model_get_selection (GTK_SELECTION_MODEL (priv->model));
-    gboolean no_selection = gtk_bitset_is_empty (selection);
+    g_autoptr (GtkBitset) selection = NULL;
+    gboolean no_selection = FALSE;
 
     search_transition_emit_delayed_signals_if_pending (view);
 
+    selection = gtk_selection_model_get_selection (GTK_SELECTION_MODEL (priv->model));
+    no_selection = gtk_bitset_is_empty (selection);
+
     process_pending_files (view);
 
     if (no_selection &&