diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 43f2ba5fa..56ed5d8d3 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -17,25 +17,11 @@
 <p><%= submit_tag l(:button_save) %>
    <%= link_to_remote l(:label_preview), 
                        { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },
-                         :method => 'get',
+                         :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('wiki_form')"
                        } %></p>
-
+<%= wikitoolbar_for 'content_text' %>
 <% end %>
 
-<% if Setting.text_formatting == 'textile' %>
-<%= javascript_include_tag 'jstoolbar' %>
-<script type="text/javascript">
-//<![CDATA[
-if (document.getElementById) { 
-	if (document.getElementById('content_text')) { 
-		var commentTb = new jsToolBar(document.getElementById('content_text')); 
-		commentTb.draw(); 
-	}
-}
-//]]>
-</script>
-<% end %>
-
-<div id="preview" class="wiki"></div>
\ No newline at end of file
+<div id="preview" class="wiki"></div>