diff --git a/lib/Cake/Console/Command/BakeShell.php b/lib/Cake/Console/Command/BakeShell.php
index 7816909c0..05e678e92 100644
--- a/lib/Cake/Console/Command/BakeShell.php
+++ b/lib/Cake/Console/Command/BakeShell.php
@@ -185,7 +185,7 @@ class BakeShell extends AppShell {
 			}
 			App::uses($controller . 'Controller', 'Controller');
 			if (class_exists($controller . 'Controller')) {
-				$this->View->args = array($controller);
+				$this->View->args = array($name);
 				$this->View->execute();
 			}
 			$this->out('', 1, Shell::QUIET);
diff --git a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php
index c4667c7cf..52c162337 100644
--- a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php
@@ -83,21 +83,38 @@ class BakeShellTest extends CakeTestCase {
 		$this->Shell->View = $this->getMock('ModelTask', array(), array(&$this->Dispatcher));
 		$this->Shell->DbConfig = $this->getMock('DbConfigTask', array(), array(&$this->Dispatcher));
 
-		$this->Shell->DbConfig->expects($this->once())->method('getConfig')->will($this->returnValue('test'));
+		$this->Shell->DbConfig->expects($this->once())
+			->method('getConfig')
+			->will($this->returnValue('test'));
 
-		$this->Shell->Model->expects($this->never())->method('getName');
-		$this->Shell->Model->expects($this->once())->method('bake')->will($this->returnValue(true));
+		$this->Shell->Model->expects($this->never())
+			->method('getName');
+	
+		$this->Shell->Model->expects($this->once())
+			->method('bake')
+			->will($this->returnValue(true));
 
-		$this->Shell->Controller->expects($this->once())->method('bake')->will($this->returnValue(true));
-		$this->Shell->View->expects($this->once())->method('execute');
+		$this->Shell->Controller->expects($this->once())
+			->method('bake')
+			->will($this->returnValue(true));
+	
+		$this->Shell->View->expects($this->once())
+			->method('execute');
 
 		$this->Shell->expects($this->once())->method('_stop');
-		$this->Shell->expects($this->at(0))->method('out')->with('Bake All');
-		$this->Shell->expects($this->at(5))->method('out')->with('<success>Bake All complete</success>');
+		$this->Shell->expects($this->at(0))
+			->method('out')
+			->with('Bake All');
+
+		$this->Shell->expects($this->at(5))
+			->method('out')
+			->with('<success>Bake All complete</success>');
 
 		$this->Shell->connection = '';
 		$this->Shell->params = array();
 		$this->Shell->args = array('User');
 		$this->Shell->all();
+
+		$this->assertEquals('User', $this->Shell->View->args[0]);
 	}
 }