diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/tree.js b/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
index ffeeccee87a66a222caf5dc110c5d6aef7309807..a139e69d9142f52212943a8fdeea5d0364d97f7d 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
@@ -69,6 +69,14 @@ Ext.extend(TYPO3.Components.Tree.StandardTree, Ext.tree.TreePanel, {
 			}
 		});
 
+		// prepare hidden input field (make sure only comma separated uids are present)
+		var selected = Ext.fly('treeinput' + this.id).dom.value.split(',');
+		for (var i = 0; i < selected.length; i++) {
+			var value = selected[i].split('|');
+			selected[i] = value[0];
+		}
+		Ext.fly('treeinput' + this.id).dom.value = selected.join(',');
+
 		Ext.apply(this, {
 			tbar: this.initialConfig.showHeader ? TYPO3.Components.Tree.Toolbar([], this) : null
 		});
@@ -188,7 +196,8 @@ TYPO3.Components.Tree.EmptySelectionModel = new Ext.tree.DefaultSelectionModel({
 
 TYPO3.Components.Tree.TcaCheckChangeHandler = function(checkedNode, checked) {
 	var exclusiveKeys = this.tcaExclusiveKeys.split(','),
-		uid = '' + checkedNode.attributes.uid;
+		uid = '' + checkedNode.attributes.uid,
+		selected = Ext.fly('treeinput' + this.id).dom.value.split(',');
 
 	this.suspendEvents();
 
@@ -232,12 +241,20 @@ TYPO3.Components.Tree.TcaCheckChangeHandler = function(checkedNode, checked) {
 			node.ui.toggleCheck(checkedNode.attributes.checked);
 		})
 	}
-	var selected = [];
+
 	this.root.cascade(function(node) {
 		if (node.ui.isChecked()) {
-			selected.push(node.attributes.uid);
+			if (selected.indexOf(node.attributes.uid) < 0) {
+				selected.push(node.attributes.uid)
+			}
+		} else {
+			var index = selected.indexOf(node.attributes.uid);
+			if (index >= 0) {
+				selected.splice(index, 1);
+			}
 		}
 	});
+
 	this.countSelectedNodes = selected.length;
 	Ext.fly('treeinput' + this.id).dom.value = selected.join(',');
 	eval(this.onChange);