diff --git a/libs/plugins/function.popup.php b/libs/plugins/function.popup.php
index 3ad24b5d..3ce7bb6b 100644
--- a/libs/plugins/function.popup.php
+++ b/libs/plugins/function.popup.php
@@ -19,7 +19,7 @@ function smarty_function_popup($params, &$smarty)
 
     if (empty($trigger)) { $trigger = "onMouseOver"; }
 
-    echo $trigger.'="return overlib(\''.str_replace("'","\'",$text).'\'';
+    echo $trigger.'="return overlib(\''.preg_replace(array("!'!","![\r\n]+!"),array("\'",'\r'),$text).'\'';
     if ($sticky) { echo ",STICKY"; }
     if (!empty($caption)) { echo ",CAPTION,'".str_replace("'","\'",$caption)."'"; }
     if (!empty($fgcolor)) { echo ",FGCOLOR,'$fgcolor'"; }
diff --git a/plugins/function.popup.php b/plugins/function.popup.php
index 3ad24b5d..3ce7bb6b 100644
--- a/plugins/function.popup.php
+++ b/plugins/function.popup.php
@@ -19,7 +19,7 @@ function smarty_function_popup($params, &$smarty)
 
     if (empty($trigger)) { $trigger = "onMouseOver"; }
 
-    echo $trigger.'="return overlib(\''.str_replace("'","\'",$text).'\'';
+    echo $trigger.'="return overlib(\''.preg_replace(array("!'!","![\r\n]+!"),array("\'",'\r'),$text).'\'';
     if ($sticky) { echo ",STICKY"; }
     if (!empty($caption)) { echo ",CAPTION,'".str_replace("'","\'",$caption)."'"; }
     if (!empty($fgcolor)) { echo ",FGCOLOR,'$fgcolor'"; }