diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b087bf3e8..9a6cb92df 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -27,6 +27,7 @@
  - fix: Edit Branch doesn't follow auto commit settings
  - fix: Importing a package doesn't follow auto commit settings
  - add: DataForm template variable for the group to view entries
+ - fix: File upload control now shows all files when deleteFileUrl exists
  - fix: EMS Badge Reporting overlaps with other EMS on the system
  - fix: SQLReport templatable download doesn't run nested queries
  - fix: Edit branch copies hide from navigation setting from events and posts to rest of branch
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index f0dabf9ae..b3d277dfc 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -165,7 +165,7 @@ sub getFilePreview {
     my $preview = "";
 	foreach my $file (@{$storage->getFiles}) {
 		if ($self->get("deleteFileUrl")) {
-			$preview = '<p style="display:inline;vertical-align:middle;"><a href="'.$self->get("deleteFileUrl").$file.'">'
+			$preview .= '<p style="display:inline;vertical-align:middle;"><a href="'.$self->get("deleteFileUrl").$file.'">'
 			    .'<img src="'.$self->session->icon->getBaseURL().'delete.gif" style="vertical-align:middle;border: 0px;" alt="x" /></a></p> ';
 		}
 		$preview .= '<p style="display:inline;vertical-align:middle;"><a href="'.$storage->getUrl($file).'">'