diff --git a/admin/admin_functions.php b/admin/admin_functions.php
index 06a59b2e555..5b4ac5aab1c 100644
--- a/admin/admin_functions.php
+++ b/admin/admin_functions.php
@@ -105,10 +105,7 @@ function bHasFileUploadQuestion($surveyid) {
     $fieldmap = createFieldMap($surveyid);
 
     foreach ($fieldmap as $field) {
-        foreach ($field as $key => $value) {
-            if ($value == "|")
-                return true;
-        }
+        if (isset($field['type']) &&  $field['type'] === '|') return true;
     }
 }
 
diff --git a/admin/browse.php b/admin/browse.php
index b75be10f414..278bc98bf0c 100644
--- a/admin/browse.php
+++ b/admin/browse.php
@@ -254,8 +254,12 @@
     {
         $browseoutput .=  "<img align='left' hspace='0' border='0' src='$imageurl/delete_disabled.png' alt='".$clang->gT("You don't have permission to delete this entry.")."'/>";
     }
+
+    if (bHasFileUploadQuestion($surveyid))
+    {
         $browseoutput .= "<a href='#' title='".$clang->gTview("Download files for this entry")."' onclick=\" ".get2post($scriptname.'?action=browse&amp;subaction=all&amp;downloadfile='.$id.'&amp;sid='.$surveyid)."\" >"
                 ."<img align='left' hspace='0' border='0' src='$imageurl/download.png' alt='".$clang->gT("Download files for this entry")."' /></a>\n";
+    }
     
     //Export this response
     $browseoutput .= "<a href='$scriptname?action=exportresults&amp;sid=$surveyid&amp;id=$id'" .