diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index 781abd15869..8613342c4ba 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -69,9 +69,10 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             List<DescriptorClassMember> selectedElements
     ) {
         JetClassBody body = classOrObject.getBody();
-        Project project = classOrObject.getProject();
         if (body == null) {
-            body = JetPsiFactory.createEmptyClassBody(project);
+            Project project = classOrObject.getProject();
+            classOrObject.add(JetPsiFactory.createWhiteSpace(project));
+            body = (JetClassBody) classOrObject.add(JetPsiFactory.createEmptyClassBody(project));
         }
 
         PsiElement afterAnchor = findInsertAfterAnchor(editor, body);
@@ -87,12 +88,8 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             afterAnchor = added;
             elementsToCompact.add((JetElement) added);
         }
-        ReferenceToClassesShortening.compactReferenceToClasses(elementsToCompact);
 
-        if (!body.isPhysical()) {
-            classOrObject.add(JetPsiFactory.createWhiteSpace(project));
-            classOrObject.add(body);
-        }
+        ReferenceToClassesShortening.compactReferenceToClasses(elementsToCompact);
     }
 
     @Nullable