diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 14934a3e4..44674bd75 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -54,6 +54,13 @@ module ApplicationHelper
     link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
   end
   
+  def toggle_link(name, id, options={})
+    onclick = "Element.toggle('#{id}'); "
+    onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
+    onclick << "return false;"
+    link_to(name, "#", :onclick => onclick)
+  end
+  
   def image_to_function(name, function, html_options = {})
     html_options.symbolize_keys!
     tag(:input, html_options.merge({ 
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 92e664452..d1c144323 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -24,10 +24,9 @@
 </div>
 
 <% if authorize_for 'news', 'add_comment' %>
-<% form_tag({:action => 'add_comment', :id => @news}) do %>
-<%= error_messages_for 'comment' %>
-<p><label for="comment_comment"><%= l(:label_comment_add) %></label><br />
-<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
-<%= submit_tag l(:button_add) %>
+<p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comment" %></p>
+<% form_tag({:action => 'add_comment', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
+<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %>
+<p><%= submit_tag l(:button_add) %></p>
 <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index b6ed913f2..4f4b5ab71 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -15,7 +15,7 @@
     <%= submit_tag l(:button_submit), :class => "button-small" %>
 </td>
 <td align="left" style="width:15%">
-    <a href="#" onclick="Element.toggle('trackerselect')"><%= l(:label_options) %></a>
+    <%= toggle_link l(:label_options), "trackerselect" %>
     <div id="trackerselect" class="rightbox overlay" style="width:140px; display:none;">
     <p><strong><%=l(:label_tracker_plural)%></strong></p>
     <% @trackers.each do |tracker| %>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 1e1eab83b..c8490fd1a 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -17,7 +17,7 @@
     <%= submit_tag l(:button_submit), :class => "button-small" %>    
 </td>
 <td>
-    <a href="#" onclick="Element.toggle('trackerselect')"><%= l(:label_options) %></a>
+    <%= toggle_link l(:label_options), "trackerselect" %>
     <div id="trackerselect" class="rightbox overlay" style="width:140px; display: none;">
     <p><strong><%=l(:label_tracker_plural)%></strong></p>
     <% @trackers.each do |tracker| %>