diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 6db81e652..3a38bce13 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -1077,12 +1077,7 @@ func (c *GitCommand) GetCommitFilesFromFilenames(filenames string, parent string
 	for _, file := range strings.Split(strings.TrimRight(filenames, "\n"), "\n") {
 		status := patch.UNSELECTED
 		if patchManager != nil && patchManager.Parent == parent {
-			var err error
-			status, err = patchManager.GetFileStatus(file)
-			if err != nil {
-				c.Log.Error(err)
-				continue
-			}
+			status = patchManager.GetFileStatus(file)
 		}
 
 		commitFiles = append(commitFiles, &CommitFile{
diff --git a/pkg/commands/patch/patch_manager.go b/pkg/commands/patch/patch_manager.go
index 0448b6c09..31eaf386b 100644
--- a/pkg/commands/patch/patch_manager.go
+++ b/pkg/commands/patch/patch_manager.go
@@ -211,13 +211,13 @@ func (p *PatchManager) RenderAggregatedPatchColored(plain bool) string {
 	return result
 }
 
-func (p *PatchManager) GetFileStatus(filename string) (int, error) {
-	info, err := p.getFileInfo(filename)
-	if err != nil {
-		return 0, err
+func (p *PatchManager) GetFileStatus(filename string) int {
+	info, ok := p.fileInfoMap[filename]
+	if !ok {
+		return UNSELECTED
 	}
 
-	return info.mode, nil
+	return info.mode
 }
 
 func (p *PatchManager) GetFileIncLineIndices(filename string) ([]int, error) {