diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index fd3c7cd95..c3a0470e2 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -699,6 +699,11 @@ class news_admin_ui extends e_admin_ui
 					$_POST['news_meta_description'] = $row['news_meta_description'];
 				}
 			}
+			else // on submit
+			{
+				if(!empty($_POST['news_meta_keywords'])) $_POST['news_meta_keywords'] = eHelper::formatMetaKeys($_POST['news_meta_keywords']);
+			}
+			
 		}	
 	}
 }
diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index 5854dcc43..efef45c8f 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -4211,7 +4211,7 @@ class eHelper
 	public static function formatMetaKeys($keywordString)
 	{
 		$keywordString = preg_replace('/[^\w\pL\s\-.,+]/u', '', strip_tags(e107::getParser()->toHTML($keywordString, TRUE)));
-		return trim(preg_replace('/[\s]+,[\s]+/', ',', str_replace('_', ' ', $keywordString)));
+		return trim(preg_replace('/[\s]?,[\s]?/', ',', str_replace('_', ' ', $keywordString)));
 	}
 	
 	public static function formatMetaDescription($descrString)