diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go
index 511d31b3d..d0c0228ec 100644
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -129,6 +129,10 @@ func (gui *Gui) handleEditCommitFile(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
+	if node.File == nil {
+		return gui.createErrorPanel(gui.Tr.ErrCannotEditDirectory)
+	}
+
 	return gui.editFile(node.GetPath())
 }