diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f7c6e2835f6..caf29ab9868 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -40,7 +40,7 @@
          <add-to-group group-id="CodeMenu" anchor="last"/>
      </action>
      <action id="ToggleJetErrorReporting" class="org.jetbrains.jet.plugin.actions.ToggleErrorReportingAction"
-             text="Toggle Error Reporting">
+             text="Error Reporting Enabled">
          <keyboard-shortcut keymap="$default" first-keystroke="control alt shift E"/>
          <add-to-group group-id="CodeMenu" anchor="last"/>
      </action>
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ToggleErrorReportingAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ToggleErrorReportingAction.java
index 7211bf2f739..eace7a6aac8 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/ToggleErrorReportingAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/ToggleErrorReportingAction.java
@@ -16,16 +16,23 @@
 
 package org.jetbrains.jet.plugin.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.ToggleAction;
 import org.jetbrains.jet.plugin.highlighter.JetPsiChecker;
 
 /**
  * @author Andrey Breslav
  */
-public class ToggleErrorReportingAction extends AnAction {
+public class ToggleErrorReportingAction extends ToggleAction {
     @Override
-    public void actionPerformed(AnActionEvent e) {
-        JetPsiChecker.setErrorReportingEnabled(!JetPsiChecker.isErrorReportingEnabled());
+    public boolean isSelected(AnActionEvent e) {
+        return JetPsiChecker.isErrorReportingEnabled();
+    }
+
+    @Override
+    public void setSelected(AnActionEvent e, boolean state) {
+        JetPsiChecker.setErrorReportingEnabled(state);
+        DaemonCodeAnalyzer.getInstance(e.getProject()).restart();
     }
 }