diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
index f304a06ec96c..cda4ff02cf0f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
@@ -13,7 +13,6 @@ import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.infos.CandidateInfo;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
@@ -131,10 +130,9 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
 
   @Override
   protected void onAlphabeticalSortingEnabled(final AnActionEvent event) {
+    mySortedByOverriding = false;
     resetElements(myToImplement || myMerge ? myAllElements : myOnlyPrimaryElements, null, true);
-    if (mySortByOverridingAction != null) {
-      mySortByOverridingAction.setSelected(event, false);
-    }
+    restoreTree();
   }
 
   @Override
@@ -221,8 +219,8 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
     @Override
     public void setSelected(AnActionEvent e, boolean state) {
       myMerge = state;
-      if (state && mySortByOverridingAction.isSelected(e)) {
-        mySortByOverridingAction.setSelected(e, false);
+      if (state && mySortedByOverriding) {
+        mySortedByOverriding = false;
       }
       resetElements(state ? myAllElements : myOnlyPrimaryElements, null, true);
       setTitle(getChooserTitle(false, myMerge));
diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
index c8c53db4ef65..157ba0eea4ae 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
@@ -172,7 +172,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
 
     defaultExpandTree();
 
-    //restoreTree();
+    restoreTree();
 
     if (myOptionControls == null) {
       myCopyJavadocCheckbox = new NonFocusableCheckBox(IdeBundle.message("checkbox.copy.javadoc"));