diff --git a/ChangeLog b/ChangeLog
index ea465979..56cf52a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
    Fix not loading plugins built against a newer API when Geany doesn't
    provide the required version given in PLUGIN_VERSION_CHECK().
    Improve documentation for PLUGIN_VERSION_CHECK().
+ * plugins/filebrowser.c:
+   Allow Find in Files when no items are selected.
 
 
 2010-06-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c
index 32ef28b9..4c6e9109 100644
--- a/plugins/filebrowser.c
+++ b/plugins/filebrowser.c
@@ -544,7 +544,9 @@ static void on_find_in_files(GtkMenuItem *menuitem, gpointer user_data)
 	gboolean is_dir = FALSE;
 
 	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
-	if (! check_single_selection(treesel))
+	/* allow 0 or 1 selections */
+	if (gtk_tree_selection_count_selected_rows(treesel) > 0 &&
+		! check_single_selection(treesel))
 		return;
 
 	list = gtk_tree_selection_get_selected_rows(treesel, &model);