diff --git a/setup.go b/setup.go
index fe723e68..c3430e77 100644
--- a/setup.go
+++ b/setup.go
@@ -55,6 +55,11 @@ func (e *Executor) Setup() error {
 }
 
 func (e *Executor) setCurrentDir() error {
+	// If the entrypoint is already set, we don't need to do anything
+	if e.Entrypoint != "" {
+		return nil
+	}
+
 	// Default the directory to the current working directory
 	if e.Dir == "" {
 		wd, err := os.Getwd()
@@ -64,22 +69,13 @@ func (e *Executor) setCurrentDir() error {
 		e.Dir = wd
 	}
 
-	// Ensure we have an absolute path
-	abs, err := filepath.Abs(e.Dir)
+	// Search for a taskfile
+	root, err := read.ExistsWalk(e.Dir)
 	if err != nil {
 		return err
 	}
-	e.Dir = abs
-
-	// If no entrypoint is specified, we need to search for a taskfile
-	if e.Entrypoint == "" {
-		root, err := read.ExistsWalk(e.Dir)
-		if err != nil {
-			return err
-		}
-		e.Dir = filepath.Dir(root)
-		e.Entrypoint = filepath.Base(root)
-	}
+	e.Dir = filepath.Dir(root)
+	e.Entrypoint = filepath.Base(root)
 
 	return nil
 }
diff --git a/taskfile/read/taskfile.go b/taskfile/read/taskfile.go
index 6b8d8706..12dc7235 100644
--- a/taskfile/read/taskfile.go
+++ b/taskfile/read/taskfile.go
@@ -311,13 +311,13 @@ func Exists(path string) (string, error) {
 		return "", err
 	}
 	if fi.Mode().IsRegular() {
-		return path, nil
+		return filepath.Abs(path)
 	}
 
 	for _, n := range defaultTaskfiles {
 		fpath := filepathext.SmartJoin(path, n)
 		if _, err := os.Stat(fpath); err == nil {
-			return fpath, nil
+			return filepath.Abs(fpath)
 		}
 	}