diff --git a/spellchecker/src/com/intellij/spellchecker/ui/SpellCheckingEditorCustomization.java b/spellchecker/src/com/intellij/spellchecker/ui/SpellCheckingEditorCustomization.java
index 500c933a5fc6..68a65d359c39 100644
--- a/spellchecker/src/com/intellij/spellchecker/ui/SpellCheckingEditorCustomization.java
+++ b/spellchecker/src/com/intellij/spellchecker/ui/SpellCheckingEditorCustomization.java
@@ -159,7 +159,7 @@ public class SpellCheckingEditorCustomization extends SimpleEditorCustomization
 
     @Override
     public boolean isToolEnabled(HighlightDisplayKey key, PsiElement element) {
-      return myUseSpellCheck && SPELL_CHECK_TOOLS.containsKey(key.toString());
+      return SPELL_CHECK_TOOLS.containsKey(key.toString()) ? myUseSpellCheck : super.isToolEnabled(key, element);
     }
 
     public void setUseSpellCheck(boolean useSpellCheck) {