diff --git a/caplets/caplet.go b/caplets/caplet.go
index e838a370..f4a6613a 100644
--- a/caplets/caplet.go
+++ b/caplets/caplet.go
@@ -44,6 +44,10 @@ func (cap *Caplet) Eval(argv []string, lineCb func(line string) error) error {
 	// temporarily change the working directory
 	return fs.Chdir(filepath.Dir(cap.Path), func() error {
 		for _, line := range cap.Code {
+			// skip empty lines and comments
+			if line == "" || line[0] == '#' {
+				continue
+			}
 			// replace $0 with argv[0], $1 with argv[1] and so on
 			for i, arg := range argv {
 				what := fmt.Sprintf("$%d", i)
diff --git a/caplets/manager.go b/caplets/manager.go
index acc84950..cb004d0c 100644
--- a/caplets/manager.go
+++ b/caplets/manager.go
@@ -79,9 +79,6 @@ func Load(name string) (error, *Caplet) {
 				return fmt.Errorf("error reading caplet %s: %v", fileName, err), nil
 			} else {
 				for line := range reader {
-					if line == "" || line[0] == '#' {
-						continue
-					}
 					cap.Code = append(cap.Code, line)
 				}