diff --git a/src/managed/OpenLiveWriter.PostEditor/PreferencesHandler.cs b/src/managed/OpenLiveWriter.PostEditor/PreferencesHandler.cs
index 934cbc6c..aedcb4a6 100644
--- a/src/managed/OpenLiveWriter.PostEditor/PreferencesHandler.cs
+++ b/src/managed/OpenLiveWriter.PostEditor/PreferencesHandler.cs
@@ -150,13 +150,10 @@ namespace OpenLiveWriter.PostEditor
             preferencesPanelTypeTable["accounts"] = type;
             types.Add(type);
 
-            //if (SpellingSettings.CanSpellCheck)
-            //{
-                // Spelling preferences.
-                type = typeof(SpellingPreferencesPanel);
-                preferencesPanelTypeTable["spelling"] = type;
-                types.Add(type);
-            //}
+            // Spelling preferences.
+            type = typeof(SpellingPreferencesPanel);
+            preferencesPanelTypeTable["spelling"] = type;
+            types.Add(type);
 
             //glossary management
             type = typeof(GlossaryPreferencesPanel);
diff --git a/src/managed/OpenLiveWriter.SpellChecker/WinSpellingChecker.cs b/src/managed/OpenLiveWriter.SpellChecker/WinSpellingChecker.cs
index 5b7a05f2..86d4a8eb 100644
--- a/src/managed/OpenLiveWriter.SpellChecker/WinSpellingChecker.cs
+++ b/src/managed/OpenLiveWriter.SpellChecker/WinSpellingChecker.cs
@@ -41,7 +41,7 @@ namespace OpenLiveWriter.SpellChecker
             if (string.IsNullOrEmpty(word))
             {
                 offset = 0;
-                length = word.Length;
+                length = 0;
                 return SpellCheckResult.Correct;
             }
 
@@ -49,8 +49,8 @@ namespace OpenLiveWriter.SpellChecker
 
             if (spellerStatus == null)
             {
-                offset = -1;
-                length = -1;
+                offset = 0;
+                length = word.Length;
                 return SpellCheckResult.Correct;
             }
             else