diff --git a/pkg/gui/filetree/commit_file_node.go b/pkg/gui/filetree/commit_file_node.go
index 1f1be2a3f..b6fd5ea55 100644
--- a/pkg/gui/filetree/commit_file_node.go
+++ b/pkg/gui/filetree/commit_file_node.go
@@ -115,6 +115,10 @@ func (node *CommitFileNode) GetIndexForPath(path string, collapsedPaths map[stri
 }
 
 func (node *CommitFileNode) Size(collapsedPaths map[string]bool) int {
+	if node == nil {
+		return 0
+	}
+
 	return size(node, collapsedPaths)
 }
 
diff --git a/pkg/gui/filetree/file_node.go b/pkg/gui/filetree/file_node.go
index cf3e69aa8..dfda68f29 100644
--- a/pkg/gui/filetree/file_node.go
+++ b/pkg/gui/filetree/file_node.go
@@ -101,6 +101,10 @@ func (node *FileNode) GetIndexForPath(path string, collapsedPaths map[string]boo
 }
 
 func (node *FileNode) Size(collapsedPaths map[string]bool) int {
+	if node == nil {
+		return 0
+	}
+
 	return size(node, collapsedPaths)
 }