diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 41660f7..50c8bf9 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -44,11 +44,11 @@
     </fieldset>
     </div>
     <p class="buttons">
-    <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+    <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
     <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
     <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
         <%= link_to_function l(:button_save),
-                             "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }'); submit_query_form('query_form')",
+                             "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                              :class => 'icon icon-save' %>
     <% end %>
     </p>
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index 0c72012..b14ffd0 100644
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -20,7 +20,7 @@
 </div>
 
 <p class="buttons">
-  <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+  <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
   <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload'  %>
 </p>
 </div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 1577da6..19104fd 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -88,7 +88,7 @@ function initFilters() {
     toggleMultiSelect($(this).siblings('select'));
   });
   $('#filters-table').on('keypress', 'input[type=text]', function(e) {
-    if (e.keyCode == 13) submit_query_form("query_form");
+    if (e.keyCode == 13) $(this).closest('form').submit();
   });
 }
 
@@ -287,10 +287,6 @@ function toggleMultiSelect(el) {
   }
 }
 
-function submit_query_form(id) {
-  $('#'+id).submit();
-}
-
 function showTab(name, url) {
   $('div#content .tab-content').hide();
   $('div.tabs a').removeClass('selected');