diff --git a/wysiwyg_filter.inc b/wysiwyg_filter.inc
index e33e649..ee674fe 100644
--- a/wysiwyg_filter.inc
+++ b/wysiwyg_filter.inc
@@ -488,7 +488,7 @@
     $groups['color']['properties']['background-repeat'] .'|'.
     $groups['color']['properties']['background-attachment'] .'|'.
     $groups['color']['properties']['background-position'] .')';
-  $groups['color']['properties']['background'] = '(?:'. $regexp .')(?:(?:\s+'. $regexp .')+)';
+  $groups['color']['properties']['background'] = '(?:'. $regexp .')(?:(?:\s*'. $regexp .')+)';
 
   // 'font' property.
   $regexp = '(?:'.
@@ -497,7 +497,7 @@
     $groups['font']['properties']['font-weight'] .'|'.
     '(?:'. $groups['font']['properties']['font-size'] .')(?:\s*/\s*'. $groups['dimension']['properties']['line-height'] .')?|'.
     $groups['font']['properties']['font-family'] .')';
-  $groups['font']['properties']['font'] = '(?:'. $regexp .')(?:(?:\s+'. $regexp .')+)';
+  $groups['font']['properties']['font'] = '(?:'. $regexp .')(?:(?:\s*'. $regexp .')+)';
 
   return $groups;
 }