diff --git a/framework/yii/bootstrap/Modal.php b/framework/yii/bootstrap/Modal.php
index f676273..6d854bc 100644
--- a/framework/yii/bootstrap/Modal.php
+++ b/framework/yii/bootstrap/Modal.php
@@ -88,6 +88,8 @@ class Modal extends Widget
 
 		echo $this->renderToggleButton() . "\n";
 		echo Html::beginTag('div', $this->options) . "\n";
+		echo Html::beginTag('div', array('class' => 'modal-dialog')) . "\n";
+		echo Html::beginTag('div', array('class' => 'modal-content')) . "\n";
 		echo $this->renderHeader() . "\n";
 		echo $this->renderBodyBegin() . "\n";
 	}
@@ -99,6 +101,8 @@ class Modal extends Widget
 	{
 		echo "\n" . $this->renderBodyEnd();
 		echo "\n" . $this->renderFooter();
+		echo "\n" . Html::endTag('div'); // modal-content
+		echo "\n" . Html::endTag('div'); // modal-dialog
 		echo "\n" . Html::endTag('div');
 
 		$this->registerPlugin('modal');
@@ -195,7 +199,7 @@ class Modal extends Widget
 	protected function initOptions()
 	{
 		$this->options = array_merge(array(
-			'class' => 'modal hide',
+			'class' => 'modal fade',
 		), $this->options);
 		Html::addCssClass($this->options, 'modal');