diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index a14122c..870c53f 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -26,6 +26,7 @@
 <% end %>
 <!--[eoform:tracker]-->
 </div>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
 </div>
 
 <div class="splitcontentright">
diff --git a/app/views/trackers/edit.rhtml b/app/views/trackers/edit.rhtml
index b5d6f9d..135bafd 100644
--- a/app/views/trackers/edit.rhtml
+++ b/app/views/trackers/edit.rhtml
@@ -2,5 +2,4 @@
 
 <% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/trackers/new.rhtml b/app/views/trackers/new.rhtml
index 6dccf0d..db32471 100644
--- a/app/views/trackers/new.rhtml
+++ b/app/views/trackers/new.rhtml
@@ -2,5 +2,4 @@
 
 <% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
 <% end %>