diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index 05e7e62d94..32ad4c02ca 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -275,7 +275,7 @@ class filemanager_select
 					'mime' => $mime,
 					'onclick' => $is_dir ? "return app.filemanager.select_goto('".addslashes($path)."'".($et2?',widget':'').");" :
 						($content['mode'] != 'open-multiple' ? "return app.filemanager.select_show('".addslashes($name)."');" :
-						"return app.filemanager.select_toggle('".addslashes($name)."');"),
+						"return app.filemanager.select_toggle('".addslashes($name)."',widget);"),
 				);
 				if ($is_dir && $content['mode'] == 'open-multiple')
 				{
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index f420e75faa..4853348b1a 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -673,10 +673,8 @@ app.filemanager = AppJS.extend(
 		editfield.value = file;
 		return false;
 	},
-	select_toggle: function(file)
+	select_toggle: function(file,widget)
 	{
-		checkbox = document.getElementById("exec[dir][selected]["+file+"]");
-		if (checkbox) checkbox.checked = !checkbox.checked;
-		return false;
+		widget._parent.getWidgetById('selected['+file+']').set_value(file);
 	}
 });
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index 00e50bda6b..fa8c65ff9b 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -50,7 +50,7 @@
 										<row class="row">
 											<vfs-mime align="center" id="$row" options="16" class="selectIcon"/>
 											<vfs id="$row" onclick="$row_cont[onclick]"/>
-											<checkbox align="right" id="selected[]" options="&quot;$row_cont[name]&quot;"/>
+											<checkbox align="right" id="selected[{$row_cont[name]}]" options="&quot;$row_cont[name]&quot;"/>
 										</row>
 									</rows>
 								</grid>