diff --git a/scp/js/jquery.translatable.js b/scp/js/jquery.translatable.js
index 64331b166423735fa904d77ff6a0f374e36688e9..41b28a16972f0272a9053dcce82a529e76426671 100644
--- a/scp/js/jquery.translatable.js
+++ b/scp/js/jquery.translatable.js
@@ -223,7 +223,7 @@
 
   $.fn.translatable.defaults = {
     menu: '<div class="translations"></div>',
-    button: '<button class="translatable"><i class="fa fa-globe icon-globe"></i></button>'
+    button: '<button type="button" class="translatable"><i class="fa fa-globe icon-globe"></i></button>'
   };
 
   $.fn.translatable.Constructor = Translatable;
diff --git a/scp/lists.php b/scp/lists.php
index 35fcef37d9d97ec0fd73e7ea7f7a6a6ac1a43cac..57509ce0add2202edac46e4b419592e5272ec084 100644
--- a/scp/lists.php
+++ b/scp/lists.php
@@ -44,10 +44,11 @@ if($_POST) {
                 // Update properties
                 if (!$errors && ($form = $list->getForm())) {
                     $names = array();
-                    foreach ($form->getDynamicFields() as $field) {
+                    $fields = $form->getDynamicFields();
+                    foreach ($fields as $field) {
                         $id = $field->get('id');
                         if ($_POST["delete-prop-$id"] == 'on' && $field->isDeletable()) {
-                            $field->delete();
+                            $fields->remove($field);
                             // Don't bother updating the field
                             continue;
                         }