diff --git a/pandora_console/godmode/massive/massive_edit_plugins.php b/pandora_console/godmode/massive/massive_edit_plugins.php
index aa6c414ed7..f14120de40 100644
--- a/pandora_console/godmode/massive/massive_edit_plugins.php
+++ b/pandora_console/godmode/massive/massive_edit_plugins.php
@@ -911,6 +911,10 @@ echo '</form>';
 		try {
 			var agentsFiltered = agentsFilteredWithAgents(agents, ids);
 			var modules = moduleNamesFromAgents(agentsFiltered);
+						
+		for (var i = 0; i < modules.length; i++) {
+			modules[i] = htmlDecode(modules[i]);
+		}
 			
 			fillModules(modules, modulesSelected);
 		}
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index e9d12424b0..415bd913ea 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1184,3 +1184,13 @@ var autoHideElement = function (element, hideTime) {
 	// Start hide
 	startHideTimeout(hideTime);
 }
+
+function htmlEncode(value){
+  // Create a in-memory div, set its inner text (which jQuery automatically encodes)
+  // Then grab the encoded contents back out. The div never exists on the page.
+  return $('<div/>').text(value).html();
+}
+
+function htmlDecode(value){
+  return $('<div/>').html(value).text();
+}
\ No newline at end of file