diff --git a/app/views/wiki/_content.html.erb b/app/views/wiki/_content.html.erb
index 96d358381..2554f5f2a 100644
--- a/app/views/wiki/_content.html.erb
+++ b/app/views/wiki/_content.html.erb
@@ -1,4 +1,4 @@
-<div class="wiki wiki-page">
+<div class="wiki wiki-page" id="wiki_content_div">
   <%= textAreailizable content, :text, :attachments => content.page.attachments,
         :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
   <%#= content.text.html_safe  %>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index b81091b7e..8ade60282 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -68,3 +68,15 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 <% html_title @page.pretty_title %>
+
+<script type="text/javascript">
+    window.onready = function() {
+        var maxwidth = $("#wiki_content_div").width();
+        $("#wiki_content_div").children().each(function(){
+            if($(this).width()>maxwidth)
+            {
+                $(this).width(maxwidth);
+            }
+        });
+    };
+</script>