diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index b11cb7b3..79532fb4 100644
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -188,7 +188,7 @@ function serendipity_smarty_fetchPrintEntries($params, &$smarty) {
     }
     
     if (!empty($params['entryprops'])) {
-        if (preg_match_all('@(.*)(!)?=[\'"]*(.*)[\'"]*(,|$)@imsU', $params['entryprops'], $m)) {
+        if (preg_match_all('@(.*)(!)?=[\'"]*([^\'"]+)[\'"]*(,|$)@imsU', $params['entryprops'], $m)) {
             foreach($m[0] AS $idx => $p) {
                 $params['joinown'] .= "\n JOIN {$serendipity['dbPrefix']}entryproperties 
                                           AS ep" . $idx . "