diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index 167355de0..9fbba485f 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -91,6 +91,7 @@ class AdminThemesControllerCore extends AdminController
 	
 	public $className = 'Theme';
 	public $table = 'theme';
+	protected $toolbar_scroll = false;
 
 	public function init()
 	{
@@ -595,4 +596,35 @@ class AdminThemesControllerCore extends AdminController
 		}
 		return !count($this->errors) ? true : false;
 	}
+
+	public function initProcess()
+	{
+		parent::initProcess();
+		// This is a composite page, we don't want the "options" display mode
+		if ($this->display == 'options')
+			$this->display = '';
+	}
+
+	/**
+	 * Function used to render the options for this controller
+	 */
+	public function renderOptions()
+	{
+		if ($this->options && is_array($this->options))
+		{
+			$helper = new HelperOptions($this);
+			$this->setHelperDisplay($helper);
+			$helper->toolbar_scroll = true;
+			$helper->title = $this->l('Theme appearance');
+			$helper->toolbar_btn = array('save' => array(
+								'href' => '#',
+								'desc' => $this->l('Save')
+							));
+			$helper->id = $this->id;
+			$helper->tpl_vars = $this->tpl_option_vars;
+			$options = $helper->generateOptions($this->options);
+
+			return $options;
+		}
+	}
 }