2 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index c7ed4d18..453a847e 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -109,6 +109,8 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
                            &size,
                            YES))
     return;
+  if (size == 0)
+    return;
   fd = disk_file_open(ectx,
                       list->filename,
                       O_RDONLY);
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index beb6efdc..f70f6630 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -479,7 +479,8 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
 
   searchString = getEntryLineValue(getMainXML(),
                                    "fssearchKeywordComboBoxEntry");
-  if (searchString == NULL) {
+  if ( (searchString == NULL) ||
+       (strlen(searchString) == 0) ) {
     GE_LOG(ectx,
            GE_ERROR | GE_USER | GE_IMMEDIATE,
            _("Need a keyword to search!\n"));