diff --git a/dir.go b/dir.go
index 4d5319e..4a18ccb 100644
--- a/dir.go
+++ b/dir.go
@@ -93,7 +93,7 @@ func (d *Dir) manipulate(cfg *Config) error {
 	// Manipulate pages
 	for i := range d.Pages {
 		var b strings.Builder
-		tmpl := cfg.Templates.FindTemplate(d.Pages[i].Path, "page.gmi")
+		tmpl := cfg.Templates.FindTemplate(d.Path, "page.gmi")
 		if err := tmpl.Execute(&b, d.Pages[i]); err != nil {
 			return err
 		}
diff --git a/main.go b/main.go
index 7e521ea..279af67 100644
--- a/main.go
+++ b/main.go
@@ -78,7 +78,9 @@ func outputHTML(p *Page, cfg *Config) (path string, content []byte) {
 	}
 
 	var b bytes.Buffer
-	tmpl := cfg.Templates.FindTemplate(pathpkg.Dir(path), "output.html")
+	// clean path to remove trailing slash
+	dir := pathpkg.Dir(pathpkg.Clean(p.Path))
+	tmpl := cfg.Templates.FindTemplate(dir, "output.html")
 	tmpl.Execute(&b, &htmlCtx{
 		Title:   p.Title,
 		Content: string(content),