diff --git a/app/assets/javascripts/samples/sample_types_groups.js b/app/assets/javascripts/samples/sample_types_groups.js
index b80e6e0ed..78e602e7e 100644
--- a/app/assets/javascripts/samples/sample_types_groups.js
+++ b/app/assets/javascripts/samples/sample_types_groups.js
@@ -39,10 +39,11 @@
         url: href,
         data: { id: id },
         success: function(data) {
-          $(li).replaceWith($.parseHTML(data.html));
+          var newLi = $.parseHTML(data.html);
+          $(li).replaceWith(newLi);
           editSampleTypeForm();
           destroySampleTypeGroup();
-          initSampleColorPicker(li)
+          initSampleColorPicker(newLi);
           appendCarretToColorPickerDropdown();
           editSampleGroupColor();
           editSampleGroupForm();
@@ -111,15 +112,13 @@
   }
 
   function editSampleGroupColor() {
-    $(document).ready(function() {
-      $('.edit_sample_group a.color-btn').off();
-      $('.edit_sample_group a.color-btn').on('click', function() {
-        var color = $(this).attr('data-value');
-        var form = $(this).closest('form');
-        $('select[name="sample_group[color]"]')
-          .val(color);
-        form.submit();
-      });
+    $('.edit_sample_group a.color-btn').off();
+    $('.edit_sample_group a.color-btn').on('click', function() {
+      var color = $(this).attr('data-value');
+      var form = $(this).closest('form');
+      $('select[name="sample_group[color]"]')
+        .val(color);
+      form.submit();
     });
   }
 
@@ -187,12 +186,13 @@
       $.ajax({
         url: li.attr('data-edit'),
         success: function(data) {
-          $(li).replaceWith($.parseHTML(data.html));
+          var newLi = $.parseHTML(data.html);
+          $(li).replaceWith(newLi);
 
           submitEditSampleTypeGroupForm();
           abortEditSampleTypeGroupAction();
           destroySampleTypeGroup();
-          initSampleColorPicker(li);
+          initSampleColorPicker(newLi);
           appendCarretToColorPickerDropdown();
           editSampleGroupColor();
 
@@ -203,10 +203,11 @@
           $('#edit_sample_group_' + data.id).off();
           $('#edit_sample_group_' + data.id)
             .bind('ajax:success', function(ev, data) {
-            $(this).closest('li').replaceWith($.parseHTML(data.html));
+            var newLi = $.parseHTML(data.html);
+            $(this).closest('li').replaceWith(newLi);
             editSampleGroupForm();
             destroySampleTypeGroup();
-            initSampleColorPicker($(this).closest('li'));
+            initSampleColorPicker(newLi);
             appendCarretToColorPickerDropdown();
             editSampleGroupColor();
           }).bind('ajax:error', function(ev, error){
diff --git a/app/views/sample_groups/_edit.html.erb b/app/views/sample_groups/_edit.html.erb
index 5a3582159..f8b4affd5 100644
--- a/app/views/sample_groups/_edit.html.erb
+++ b/app/views/sample_groups/_edit.html.erb
@@ -12,7 +12,7 @@
     </div>
     <div class="col-xs-4 text-right">
       <button type="button"
-              class="edit-confirm btn btn-primary"><%= t('general.edit') %></button>
+              class="edit-confirm btn btn-primary"><%= t('general.save') %></button>
       <button type="button"
               class="abort btn btn-default"
               data-element="<%=
diff --git a/app/views/sample_types/_edit.html.erb b/app/views/sample_types/_edit.html.erb
index 9fb455a2c..cd40dfc52 100644
--- a/app/views/sample_types/_edit.html.erb
+++ b/app/views/sample_types/_edit.html.erb
@@ -11,7 +11,7 @@
     </div>
     <div class="col-xs-4 text-right">
       <button type="button"
-              class="edit-confirm btn btn-primary"><%= t('general.edit') %></button>
+              class="edit-confirm btn btn-primary"><%= t('general.save') %></button>
       <button type="button"
               class="abort btn btn-default"
               data-element="<%=
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f19afc78..29bdaa123 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1458,6 +1458,7 @@ en:
     update: "Update"
     edit: "Edit"
     cancel: "Cancel"
+    save: "Save"
     close: "Close"
     create: 'Create'
     check_all: "Check all"