diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 3993b9ebf..b1693f7b3 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -32,7 +32,6 @@
 <% if @issue.safe_attribute? 'description' %>
 <p>
   <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
-  <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
   <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
     <%= f.text_area :description, :cols => 60, :accesskey => accesskey(:edit), :class => 'wiki-edit',
                    :rows => [[10, @issue.description.to_s.length / 50].max, 20].min,
@@ -41,6 +40,7 @@
                    },
                    :no_label => true %>
   <% end %>
+  <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
 </p>
 <%= wikitoolbar_for 'issue_description', preview_issue_path(:project_id => @issue.project, :issue_id => @issue.id) %>
 <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b92a34d68..632501ea0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -905,7 +905,7 @@ label.block {
   color: #bb0000;
 }
 
-.tabular label.error + * {
+.tabular label.error + *:not(#issue_description_and_toolbar), .tabular label.error + span#issue_description_and_toolbar div.jstBlock {
   border: 1px solid #bb0000;
 }