diff --git a/lib/redmine/wiki_formatting/markdown/helper.rb b/lib/redmine/wiki_formatting/markdown/helper.rb
index 4f79acdd7..208daa107 100644
--- a/lib/redmine/wiki_formatting/markdown/helper.rb
+++ b/lib/redmine/wiki_formatting/markdown/helper.rb
@@ -34,15 +34,21 @@ def initial_page_content(page)
         def heads_for_wiki_formatter
           unless @heads_for_wiki_formatter_included
             content_for :header_tags do
-              javascript_include_tag('jstoolbar/jstoolbar') +
-              javascript_include_tag('jstoolbar/markdown') +
-              javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
-              javascript_tag("var wikiImageMimeTypes = #{Redmine::MimeType.by_type('image').to_json};") +
-              stylesheet_link_tag('jstoolbar')
+              asset_renderigns_for_wiki_formatter.values.map(&:call).join.html_safe
             end
             @heads_for_wiki_formatter_included = true
           end
         end
+
+        def asset_renderigns_for_wiki_formatter
+          {
+            script_jstoolbar: Proc.new { javascript_include_tag('jstoolbar/jstoolbar') },
+            script_format_adapter: Proc.new { javascript_include_tag('jstoolbar/markdown') },
+            script_jstoolbar_lang: Proc.new { javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") },
+            script_wiki_mime_types: Proc.new { javascript_tag("var wikiImageMimeTypes = #{Redmine::MimeType.by_type('image').to_json};") },
+            style_jstoolbar: Proc.new { stylesheet_link_tag('jstoolbar') }
+          }
+        end
       end
     end
   end
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index 3d8c2d163..294330f4b 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -35,15 +35,21 @@ def initial_page_content(page)
         def heads_for_wiki_formatter
           unless @heads_for_wiki_formatter_included
             content_for :header_tags do
-              javascript_include_tag('jstoolbar/jstoolbar') +
-              javascript_include_tag('jstoolbar/textile') +
-              javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
-              javascript_tag("var wikiImageMimeTypes = #{Redmine::MimeType.by_type('image').to_json};") +
-              stylesheet_link_tag('jstoolbar')
+              asset_renderigns_for_wiki_formatter.values.map(&:call).join.html_safe
             end
             @heads_for_wiki_formatter_included = true
           end
         end
+
+        def asset_renderigns_for_wiki_formatter
+          {
+            script_jstoolbar: Proc.new { javascript_include_tag('jstoolbar/jstoolbar') },
+            script_format_adapter: Proc.new { javascript_include_tag('jstoolbar/textile') },
+            script_jstoolbar_lang: Proc.new { javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") },
+            script_wiki_mime_types: Proc.new { javascript_tag("var wikiImageMimeTypes = #{Redmine::MimeType.by_type('image').to_json};") },
+            style_jstoolbar: Proc.new { stylesheet_link_tag('jstoolbar') }
+          }
+        end
       end
     end
   end