diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index cf135408d..63d697d7c 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -627,8 +627,7 @@ function conv_selected_option($options, $value)
     if(!$options)
         return '';
 
-    //$options = str_replace('value="'.$value.'"', 'value="'.$value.'" selected="selected"', $options);
-    $options = preg_replace('/(value=[\'\"]'.$value.'[\'\"])/', '\\1 selected="selected"', $options);
+    $options = preg_replace('/(value=[\'\"]?'.$value.'[\'\"]?)/i', '\\1 selected="selected"', $options);
 
     return $options;
 }