diff --git a/src/components/Widgets/ListControl.js b/src/components/Widgets/ListControl.js
index 579f3352..cbebdb86 100644
--- a/src/components/Widgets/ListControl.js
+++ b/src/components/Widgets/ListControl.js
@@ -89,17 +89,21 @@ export default class ListControl extends Component {
 
   handleChangeFor(index) {
     return (newValue, newMetadata) => {
-      const { value, onChange } = this.props;
+      const { value, metadata, onChange, forID } = this.props;
       const parsedValue = (this.valueType === valueTypes.SINGLE) ? newValue.first() : newValue;
-      onChange(value.set(index, parsedValue), newMetadata);
+      const parsedMetadata = {
+        [forID]: Object.assign(metadata ? metadata.toJS() : {}, newMetadata ? newMetadata[forID] : {}),
+      };
+      onChange(value.set(index, parsedValue), parsedMetadata);
     };
   }
 
   handleRemove(index) {
     return (e) => {
       e.preventDefault();
-      const { value, onChange } = this.props;
-      onChange(value.remove(index));
+      const { value, metadata, onChange, forID } = this.props;
+      const parsedMetadata = { [forID]: metadata.remove(metadata.keySeq().get(0)) };
+      onChange(value.remove(index), parsedMetadata);
     };
   }
 
@@ -193,3 +197,7 @@ export default class ListControl extends Component {
     />);
   }
 }
+
+
+// WEBPACK FOOTER //
+// ./components/Widgets/ListControl.js