diff --git a/NEWS b/NEWS
index 973a8f4e..0db319bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+  - fix quoting of values in smarty_function_popup() (messju)
   - fix handling of hidden sections in Config_File (messju)
   - add handling of resources for {config_load} (messju)
   - fix bug when using arrays with tr_attr and td_attr in {html_table} (messju)
diff --git a/libs/plugins/function.popup.php b/libs/plugins/function.popup.php
index 407081ba..90323ce5 100644
--- a/libs/plugins/function.popup.php
+++ b/libs/plugins/function.popup.php
@@ -31,7 +31,7 @@ function smarty_function_popup($params, &$smarty)
             case 'caption':
             case 'closetext':
             case 'status':
-                $append .= ',' . strtoupper($_key) . "','" . str_replace("'","\'",$_value) . "'";
+                $append .= ',' . strtoupper($_key) . ",'" . str_replace("'","\'",$_value) . "'";
                 break;
 
             case 'fgcolor':
@@ -65,7 +65,8 @@ function smarty_function_popup($params, &$smarty)
             case 'frame':
             case 'timeout':
             case 'delay':
-                $append .= ',' . strtoupper($_key) . "','$_value'";
+            case 'function':
+                $append .= ',' . strtoupper($_key) . ",'$_value'";
                 break;
 
             case 'sticky':
@@ -83,10 +84,6 @@ function smarty_function_popup($params, &$smarty)
                 if ($_value) $append .= ',' . strtoupper($_key);
                 break;
 
-            case 'function':
-                $append .= ',' . strtoupper($_key) . "',$_value";
-                break;
-
             default:
                 $smarty->trigger_error("[popup] unknown parameter $_key", E_USER_WARNING);
         }