diff --git a/pandora_console/include/javascript/map/MapController.js b/pandora_console/include/javascript/map/MapController.js
index 1de1b66130..6b40827500 100644
--- a/pandora_console/include/javascript/map/MapController.js
+++ b/pandora_console/include/javascript/map/MapController.js
@@ -1586,7 +1586,7 @@ MapController.prototype.events_for_nodes = function(id_node) {
 		$.each(nodes, function(i, node) {
 			if (!self.is_draggable(node))
 				return 1; // Continue
-			
+
 			var status_selection =
 				self.get_status_selection_node(node.graph_id);
 			
@@ -1643,6 +1643,7 @@ MapController.prototype.is_draggable = function(node) {
 	var return_var = false;
 	
 	switch (node.type) {
+		case ITEM_TYPE_MODULE_NETWORKMAP:
 		case ITEM_TYPE_AGENT_NETWORKMAP:
 		case ITEM_TYPE_FICTIONAL_NODE:
 			return_var = true;
diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js
index fa51b4d4dd..9f45d1b961 100644
--- a/pandora_console/include/javascript/map/NetworkmapController.js
+++ b/pandora_console/include/javascript/map/NetworkmapController.js
@@ -117,9 +117,16 @@ NetworkmapController.prototype.init_map = function() {
 NetworkmapController.prototype.filter_only_agents = function(node) {
 	switch (node.type) {
 		case ITEM_TYPE_EDGE_NETWORKMAP:
-		case ITEM_TYPE_MODULE_NETWORKMAP:
 			return false;
 			break;
+		case ITEM_TYPE_MODULE_NETWORKMAP:
+			if (filter['show_modules']) {
+				return true;
+			}
+			else {
+				return false;
+			}
+			break;
 		default:
 			return true;
 			break;