diff --git a/sites/all/modules/gmap/gmap_plugin_style_gmap.inc b/sites/all/modules/gmap/gmap_plugin_style_gmap.inc
index 2d39939..1515c21 100755
--- a/sites/all/modules/gmap/gmap_plugin_style_gmap.inc
+++ b/sites/all/modules/gmap/gmap_plugin_style_gmap.inc
@@ -272,6 +272,12 @@ class gmap_plugin_style_gmap extends views_plugin_style {
           $tooltip = '';
           if ($this->options['tooltipenabled'] && !empty($this->rendered_fields[$row_index][$this->options['tooltipfield']])) {
             $tooltip = $this->rendered_fields[$row_index][$this->options['tooltipfield']];
+            if(strpos($tooltip, '&#039;') !== false) {
+              $tooltip = str_replace("&#039;","'",$tooltip);
+            }
+            if(strpos($tooltip, '&amp;') !== false) {
+                $tooltip = str_replace("&amp;","&",$tooltip);
+            }
           }
 
           $bubbletext = NULL;
