diff --git a/waflib/Scripting.py b/waflib/Scripting.py
index 749d4f2e..c6b120cb 100644
--- a/waflib/Scripting.py
+++ b/waflib/Scripting.py
@@ -110,9 +110,8 @@ def waf_entry_point(current_directory, version, wafdir):
 					Context.out_dir = env.out_dir
 					break
 
-		if not Context.run_dir:
-			if Context.WSCRIPT_FILE in lst:
-				Context.run_dir = cur
+		if Context.WSCRIPT_FILE in lst:
+			Context.run_dir = cur
 
 		next = os.path.dirname(cur)
 		if next == cur: