diff --git a/src/Shell/Task/BakeTask.php b/src/Shell/Task/BakeTask.php
index 14cf3aa2d..571e424ae 100644
--- a/src/Shell/Task/BakeTask.php
+++ b/src/Shell/Task/BakeTask.php
@@ -250,6 +250,7 @@ public function getOptionParser()
         ])->addOption('theme', [
             'short' => 't',
             'help' => 'The theme to use when baking code.',
+            'default' => Configure::read('Bake.theme'),
             'choices' => $bakeThemes
         ]);