diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index 9222f2a..740a502 100755
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -35,9 +35,7 @@
 			<p>
 			<label for="content">{$panelstrings.content}</label>
 			</p>
-			{if function_exists('plugin_bbcode_init')}
-				{include file='plugin:bbcode/toolbar'}
-			{/if}
+			{toolbar}
 			<p>
 			<textarea name="content" class="{$class}" 
 			id="content" rows="20" cols="74">{$content|default:{$smarty.request.content|default:''}|htmlspecialchars}</textarea><br />
diff --git a/admin/panels/entry/shared.entry.form.tpl b/admin/panels/entry/shared.entry.form.tpl
index 86e7cf4..2b3f5f0 100755
--- a/admin/panels/entry/shared.entry.form.tpl
+++ b/admin/panels/entry/shared.entry.form.tpl
@@ -15,7 +15,7 @@
 		<input type="text" name="subject" id="subject" value="{$subject|default:$smarty.request.subject}" /><br />
 		<input type="hidden" name="timestamp" value="{$date}" />
 		</p>
-	{toolbar}
+		{toolbar}
 		<p>
 		<label for="content">{$panelstrings.content}</label><br />
 		<textarea name="content" id="content" rows="20" cols="74"{$content|default:$smarty.request.content}</textarea><br />
diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl
index 31f1f86..627d2f0 100755
--- a/admin/panels/static/admin.static.write.tpl
+++ b/admin/panels/static/admin.static.write.tpl
@@ -30,9 +30,7 @@
 			<p>
 			<label for="content">{$panelstrings.content}</label>
 			</p>
-			{if function_exists('plugin_bbcode_init')}
-				{include file='plugin:bbcode/toolbar'}
-			{/if}
+			{toolbar}
 			<p>
 			{if isset($error) && isset($error.content) && !empty($error.content)}
 				{assign var=class value=" field-error"}
diff --git a/fp-plugins/bbcode/plugin.bbcode.php b/fp-plugins/bbcode/plugin.bbcode.php
index 865b643..72c4ed3 100644
--- a/fp-plugins/bbcode/plugin.bbcode.php
+++ b/fp-plugins/bbcode/plugin.bbcode.php
@@ -46,8 +46,7 @@ function plugin_bbcode_startup() {
 	add_filter('the_content', 'plugin_bbcode_undoHtml', 30);
 	if (BBCODE_USE_EDITOR) {
 		// initialize the toolbar
-		add_filter('editor_toolbar', 'plugin_bbcode_toolbar');
-		plugin_bbcode_init_toolbar();
+		add_filter('editor_toolbar', 'plugin_bbcode_init_toolbar');
 	}
 	if (BBCODE_ENABLE_COMMENTS) {
 		add_filter('comment_text', 'plugin_bbcode_comment', 1);
@@ -784,6 +783,8 @@ function plugin_bbcode_init_toolbar() {
 	sort($attachslist);
 	array_unshift($attachslist, '--');
 	$_FP_SMARTY->assign('attachs_list', $attachslist);
+
+	echo $_FP_SMARTY->fetch('plugin:bbcode/toolbar');
 }
 
 /**