diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
index 49fc79b23..94dfc4619 100644
--- a/lib/Cake/Console/Command/SchemaShell.php
+++ b/lib/Cake/Console/Command/SchemaShell.php
@@ -68,7 +68,7 @@ class SchemaShell extends AppShell {
 		}
 		if ($name && empty($this->params['file'])) {
 			$this->params['file'] = Inflector::underscore($name);
-		} else {
+		} elseif(empty($this->params['file'])) {
 			$this->params['file'] = 'schema.php';
 		}
 		if (strpos($this->params['file'], '.php') === false) {