diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java b/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
index 23565bf6785d..9b87081ce6ea 100644
--- a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
+++ b/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pass;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.WindowManager;
@@ -25,6 +26,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.RefactoringActionHandler;
 import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.refactoring.util.duplicates.DuplicatesImpl;
@@ -32,6 +34,8 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 public class ExtractMethodHandler implements RefactoringActionHandler {
   private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractMethod.ExtractMethodHandler");
 
@@ -42,19 +46,40 @@ public class ExtractMethodHandler implements RefactoringActionHandler {
       final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext);
       final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
       if (file != null && editor != null) {
-        final ExtractMethodProcessor processor = getProcessor(elements, project, file, editor, true);
-        if (processor != null) {
-          invokeOnElements(project, editor, processor, true);
-        }
+        invokeOnElements(project, editor, file, elements);
       }
     }
   }
 
-  public void invoke(@NotNull final Project project, Editor editor, PsiFile file, DataContext dataContext) {
+  public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file, DataContext dataContext) {
+    final Pass<PsiElement[]> callback = new Pass<PsiElement[]>() {
+      public void pass(final PsiElement[] selectedValue) {
+        invokeOnElements(project, editor, file, selectedValue);
+      }
+    };
+    selectAndPass(project, editor, file, callback);
+  }
+
+  public static void selectAndPass(final Project project, final Editor editor, final PsiFile file, final Pass<PsiElement[]> callback) {
     editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
     if (!editor.getSelectionModel().hasSelection()) {
-      editor.getSelectionModel().selectLineAtCaret();
+      final int offset = editor.getCaretModel().getOffset();
+      final PsiElement[] statementsInRange = IntroduceVariableBase.findStatementsAtOffset(editor, file, offset);
+      final List<PsiExpression> expressions = IntroduceVariableBase.collectExpressions(file, editor, offset, statementsInRange);
+      if (expressions.size() < 2) {
+        editor.getSelectionModel().selectLineAtCaret();
+      }
+      else {
+        IntroduceVariableBase.showChooser(editor, expressions, new Pass<PsiExpression>() {
+          @Override
+          public void pass(PsiExpression psiExpression) {
+            callback.pass(new PsiExpression[]{psiExpression});
+          }
+        });
+        return;
+      }
     }
+
     int startOffset = editor.getSelectionModel().getSelectionStart();
     int endOffset = editor.getSelectionModel().getSelectionEnd();
 
@@ -68,7 +93,10 @@ public class ExtractMethodHandler implements RefactoringActionHandler {
     else {
       elements = CodeInsightUtil.findStatementsInRange(file, startOffset, endOffset);
     }
+    callback.pass(elements);
+  }
 
+  private static void invokeOnElements(Project project, Editor editor, PsiFile file, PsiElement[] elements) {
     final ExtractMethodProcessor processor = getProcessor(elements, project, file, editor, true);
     if (processor != null) {
       invokeOnElements(project, editor, processor, true);
diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java b/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
index 4df671148662..ee8e6aec2905 100644
--- a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
+++ b/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
@@ -4,17 +4,14 @@
  */
 package com.intellij.refactoring.extractMethodObject;
 
-import com.intellij.codeInsight.CodeInsightUtil;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDocumentManager;
+import com.intellij.openapi.util.Pass;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiExpression;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.RefactoringActionHandler;
@@ -29,24 +26,14 @@ public class ExtractMethodObjectHandler implements RefactoringActionHandler {
   private static final Logger LOG = Logger.getInstance("#" + ExtractMethodObjectHandler.class.getName());
 
   public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file, final DataContext dataContext) {
-    editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
-    if (!editor.getSelectionModel().hasSelection()) {
-      editor.getSelectionModel().selectLineAtCaret();
-    }
-    int startOffset = editor.getSelectionModel().getSelectionStart();
-    int endOffset = editor.getSelectionModel().getSelectionEnd();
-
-    PsiDocumentManager.getInstance(project).commitAllDocuments();
-
-    PsiElement[] elements;
-    PsiExpression expr = CodeInsightUtil.findExpressionInRange(file, startOffset, endOffset);
-    if (expr != null) {
-      elements = new PsiElement[]{expr};
-    }
-    else {
-      elements = CodeInsightUtil.findStatementsInRange(file, startOffset, endOffset);
-    }
+    ExtractMethodHandler.selectAndPass(project, editor, file, new Pass<PsiElement[]>() {
+      public void pass(final PsiElement[] selectedValue) {
+        invokeOnElements(project, editor, file, selectedValue);
+      }
+    });
+  }
 
+  private void invokeOnElements(final Project project, final Editor editor, PsiFile file, PsiElement[] elements) {
     if (elements.length == 0) {
         String message = RefactoringBundle
           .getCannotRefactorMessage(RefactoringBundle.message("selected.block.should.represent.a.set.of.statements.or.an.expression"));