diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java
index c049c27b8ad5..713afe952eb5 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java
@@ -264,15 +264,17 @@ public class JavaIntroduceParameterObjectDelegate
         conflicts.putValue(method, "Created class won't be accessible");
       }
 
-      final PsiFile containingFile = method.getContainingFile();
-      final PsiDirectory containingDirectory = containingFile.getContainingDirectory();
-      PsiDirectory directory = moveDestination.getTargetDirectory(containingDirectory);
-      if (directory != null) {
-        PsiFile file = directory.findFile(classDescriptor.getClassName() + ".java");
-        if (file != null) {
-          VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
-          if (virtualFile != null) {
-            conflicts.putValue(method, "File already exits: " + virtualFile.getPresentableUrl());
+      if (!classDescriptor.isCreateInnerClass()) {
+        final PsiFile containingFile = method.getContainingFile();
+        final PsiDirectory containingDirectory = containingFile.getContainingDirectory();
+        PsiDirectory directory = moveDestination.getTargetDirectory(containingDirectory);
+        if (directory != null) {
+          PsiFile file = directory.findFile(classDescriptor.getClassName() + ".java");
+          if (file != null) {
+            VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
+            if (virtualFile != null) {
+              conflicts.putValue(method, "File already exits: " + virtualFile.getPresentableUrl());
+            }
           }
         }
       }
diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
index 6210e347f1f7..0b7d16660114 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
@@ -84,9 +84,13 @@ public abstract class ParameterTablePanel extends AbstractParameterTablePanel<Va
     typeColumn.setCellEditor(new AbstractTableCellEditor() {
       TypeSelector myCurrentSelector;
       final JBComboBoxTableCellEditorComponent myEditorComponent = new JBComboBoxTableCellEditorComponent();
+      final JLabel myTypeLabel = new JLabel();
 
       @Nullable
       public Object getCellEditorValue() {
+        if (myCurrentSelector.getComponent() instanceof JLabel) {
+          return myCurrentSelector.getSelectedType();
+        }
         return myEditorComponent.getEditorValue();
       }
 
@@ -95,12 +99,19 @@ public abstract class ParameterTablePanel extends AbstractParameterTablePanel<Va
                                                    final boolean isSelected,
                                                    final int row,
                                                    final int column) {
+        myCurrentSelector = myParameterTypeSelectors[row];
+        if (myParameterTypeSelectors[row].getComponent() instanceof JLabel) {
+          PsiType selectedType = myCurrentSelector.getSelectedType();
+          if (selectedType != null) {
+            myTypeLabel.setText(selectedType.getPresentableText());
+          }
+          return myTypeLabel;
+        }
         myEditorComponent.setCell(table, row, column);
-        myEditorComponent.setOptions(myParameterTypeSelectors[row].getTypes());
+        myEditorComponent.setOptions(myCurrentSelector.getTypes());
         myEditorComponent.setDefaultValue(getVariableData()[row].type);
         myEditorComponent.setToString(o -> ((PsiType)o).getPresentableText());
 
-        myCurrentSelector = myParameterTypeSelectors[row];
         return myEditorComponent;
       }
     });