diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 5aaf6ffbf6..7d0c358f8a 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -89,7 +89,7 @@
 		 {
 			foreach($options as $option => $value)
 			{
-			   $opt_out .= 'this.T_'.strtoupper($option).'='.(is_numeric($value)?$value:"'$value'").'; ';
+				$opt_out .= 'this.T_'.strtoupper($option).'='.(is_numeric($value)?$value:"'".str_replace("'","\\'",$value)."'").'; ';
 			}
 		 }
 		 if ($text === False) return ' onmouseover="'.$opt_out.'return escape(this.innerHTML);"';