diff --git a/classes/submission/form/ArticleGalleyForm.inc.php b/classes/submission/form/ArticleGalleyForm.inc.php
index 8a78d02..3fb7eed 100644
--- a/classes/submission/form/ArticleGalleyForm.inc.php
+++ b/classes/submission/form/ArticleGalleyForm.inc.php
@@ -135,6 +135,7 @@ class ArticleGalleyForm extends Form {
 
 		$fileName = isset($fileName) ? $fileName : 'galleyFile';
 		$journal =& Request::getJournal();
+		$fileId = null;
 
 		if (isset($this->galley)) {
 			$galley =& $this->galley;
@@ -143,6 +144,7 @@ class ArticleGalleyForm extends Form {
 			if ($articleFileManager->uploadedFileExists($fileName)) {
 				if($galley->getFileId()) {
 					$articleFileManager->uploadPublicFile($fileName, $galley->getFileId());
+					$fileId = $galley->getFileId();
 				} else {
 					$fileId = $articleFileManager->uploadPublicFile($fileName);
 					$galley->setFileId($fileId);
@@ -179,12 +181,6 @@ class ArticleGalleyForm extends Form {
 			if ($articleFileManager->uploadedFileExists($fileName)) {
 				$fileType = $articleFileManager->getUploadedFileType($fileName);
 				$fileId = $articleFileManager->uploadPublicFile($fileName);
-
-				// Update file search index
-				import('classes.search.ArticleSearchIndex');
-				ArticleSearchIndex::updateFileIndex($this->articleId, ARTICLE_SEARCH_GALLEY_FILE, $fileId);
-			} else {
-				$fileId = 0;
 			}
 
 			if (isset($fileType) && strstr($fileType, 'html')) {
@@ -242,6 +238,12 @@ class ArticleGalleyForm extends Form {
 			$this->galleyId = $galley->getId();
 		}
 
+		if ($fileId) {
+			// Update file search index
+			import('classes.search.ArticleSearchIndex');
+			ArticleSearchIndex::updateFileIndex($this->articleId, ARTICLE_SEARCH_GALLEY_FILE, $fileId);
+		}
+
 		return $this->galleyId;
 	}