diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3b10af2263..82dbb4d004 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* operation/gis_maps/render_view.php: Resize GIS map on fullscreen.
+	
+	Bugfix merged from branches.
+
 2012-04-19  Vanessa Gil  <vanessa.gil@artica.es>
 
 	* pandoradb.data.oracle.sql
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 1598438af3..7adcf2ed10 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -188,4 +188,20 @@ if ($layers != false) {
 	gis_activate_select_control();
 	gis_activate_ajax_refresh($layers, $timestampLastOperation);
 }
+
+// Resize GIS map on fullscreen
+if ($config["pure"] != 0) {
+?>
+	<script type="text/javascript">
+		$().ready(function(){
+			
+			var new_height = $(document).height();
+			var new_width = $(document).width();
+			$("#map").css("height", new_height - 60);
+			$("#map").css("width", new_width - 25);
+			
+		});
+	</script>
+<?php
+}
 ?>