diff --git a/pandora_console/include/javascript/map/MapController.js b/pandora_console/include/javascript/map/MapController.js
index 951fde8be6..969d879922 100644
--- a/pandora_console/include/javascript/map/MapController.js
+++ b/pandora_console/include/javascript/map/MapController.js
@@ -34,6 +34,8 @@ var MapController = function(target, refresh_time) {
 /*-----------------------------------------------*/
 MapController.prototype._id = null;
 MapController.prototype._viewport = null;
+MapController.prototype._viewport_nodes = null;
+MapController.prototype._viewport_edges = null;
 MapController.prototype._minimap_viewport = null;
 MapController.prototype._minimap = null;
 MapController.prototype._zoomManager = null;
@@ -90,6 +92,12 @@ MapController.prototype.init_map = function() {
 		.append("g")
 			.attr("class", "viewport");
 	
+	self._viewport_edges = self._viewport.append("g")
+		.attr("class", "viewport_edges");
+	
+	self._viewport_nodes = self._viewport.append("g")
+		.attr("class", "viewport_nodes");
+	
 	self._minimap = svg
 		.append("g")
 			.attr("class", "minimap");
diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js
index f66e756772..3d2524d758 100644
--- a/pandora_console/include/javascript/map/NetworkmapController.js
+++ b/pandora_console/include/javascript/map/NetworkmapController.js
@@ -985,7 +985,7 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 NetworkmapController.prototype.paint_nodes = function() {
 	var self = this;
 	
-	self._viewport.selectAll(".node")
+	self._viewport_nodes.selectAll(".node")
 		.data(
 			self.get_nodes_map()
 				.filter(function(d, i) {
@@ -1004,7 +1004,7 @@ NetworkmapController.prototype.paint_nodes = function() {
 NetworkmapController.prototype.paint_arrows = function() {
 	var self = this;
 	
-	var arrow_layouts = self._viewport.selectAll(".arrow")
+	var arrow_layouts = self._viewport_edges.selectAll(".arrow")
 		.data(self.get_edges_map())
 		.enter()
 			.append("g")