diff --git a/src/Orchard/Environment/Configuration/ShellSettingsManager.cs b/src/Orchard/Environment/Configuration/ShellSettingsManager.cs
index 9c408261c..c6a8811a6 100644
--- a/src/Orchard/Environment/Configuration/ShellSettingsManager.cs
+++ b/src/Orchard/Environment/Configuration/ShellSettingsManager.cs
@@ -54,8 +54,11 @@ namespace Orchard.Environment.Configuration {
             if (String.IsNullOrEmpty(text))
                 return shellSettings;
 
-            var settings = text.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
-            foreach (var setting in settings) {
+            var settings = new StringReader(text);
+            string setting;
+            while ((setting = settings.ReadLine()) != null)
+            {
+                if (string.IsNullOrWhiteSpace(setting)) continue; ;
                 var separatorIndex = setting.IndexOf(Separator);
                 if (separatorIndex == -1)
                 {