diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index bce2365ae..39c385b35 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -601,7 +601,7 @@ class ModuleHandler extends Handler
 			Context::addHtmlFooter($footer);
 		}
 
-		if($type == "view" && $kind != 'admin')
+		if(($type === 'view' || $type === 'mobile') && $kind !== 'admin')
 		{
 			$domain_info = Context::get('site_module_info');
 			if ($domain_info && $domain_info->settings && $domain_info->settings->html_header)
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index acc5bb6dd..680d40093 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -116,7 +116,7 @@
 				</p>
 				<p>
 					<span class="editor_type">{$lang->guide_editor_toolbar}</span>
-					<select name="editor_toolbar" style="min-width:104px">
+					<select name="comment_editor_toolbar" style="min-width:104px">
 						<option value="default" selected="selected"|cond="!$editor_config->comment_editor_toolbar || $editor_config->comment_editor_toolbar === 'default'">{$lang->editor_toolbar_default}</option>
 						<option value="default" selected="selected"|cond="$editor_config->comment_editor_toolbar === 'simple'">{$lang->editor_toolbar_simple}</option>
 					</select> &nbsp;