diff --git a/app/Console/cake.php b/app/Console/cake.php
index b65ce848..30e6df98 100644
--- a/app/Console/cake.php
+++ b/app/Console/cake.php
@@ -37,4 +37,10 @@
 }
 unset($dispatcher, $root, $ds);
 
+// Make passing "--working ." to the shell obsolete, when invoking Console/cake.php directly
+if (!in_array('--working', $argv)) {
+	$argv[] = '--working';
+	$argv[] = dirname(dirname(__FILE__));
+}
+
 return ShellDispatcher::run($argv);