diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index dce3c8b52b..0236a96880 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -1,4 +1,5 @@
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+<%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
| <% 7.times do |i| %><%= day_name( (calendar.first_wday+i)%7 ) %> | <% end %>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 1f2ad6bd91..00dd2c2301 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -166,6 +166,7 @@
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
<%= content_tag(:div, :class => "gantt_subjects") do %>
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+ <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
<%= @gantt.subjects.html_safe %>
<% end %>
<% end %>
@@ -343,6 +344,7 @@
<% end %>
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+ <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
<%= @gantt.lines.html_safe %>
<% end %>