diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 1da973f2b54f..595d9da23e61 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -2784,7 +2784,7 @@
 
     <registryKey key="java.create.compact.source.file.separately"
                  defaultValue="true"
-                 description="Show 'Create java compact source file' separately from all other classes"/>
+                 description="Show 'Create java compact file' separately from all other classes"/>
 
     <virtualFileCustomDataProvider implementation="com.intellij.ide.JavaCodeStyleSettingsCustomDataSynchronizer"/>
   </extensions>
diff --git a/java/java-impl/resources/fileTemplates/internal/SimpleSourceFile.java.ft b/java/java-impl/resources/fileTemplates/internal/SimpleSourceFile.java.ft
index 5468e82725c6..f7a9023c37cf 100644
--- a/java/java-impl/resources/fileTemplates/internal/SimpleSourceFile.java.ft
+++ b/java/java-impl/resources/fileTemplates/internal/SimpleSourceFile.java.ft
@@ -1,4 +1,4 @@
 #parse("File Header.java")
-void main(#[[$END$]]#) {
-
+void main() {
+  #[[$END$]]#
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateClassActionTest.kt b/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateClassActionTest.kt
index a4e4b9f1e56b..35bca8c87181 100644
--- a/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateClassActionTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateClassActionTest.kt
@@ -40,7 +40,7 @@ class CreateClassActionTest: LightJavaCodeInsightFixtureTestCase() {
     val clazz = JavaDirectoryService.getInstance().createClass(psiDirectory!!, expectedFileName, JavaTemplateUtil.INTERNAL_SIMPLE_SOURCE_FILE)
     assertEquals("""
       void main() {
-
+          
       }
     """.trimIndent(), clazz.text)
     val fileName = clazz.containingFile.name
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index 5a9ce9078503..de6e20e0da84 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -307,12 +307,15 @@
     </action>
 
     <group id="NewJavaSpecialFile">
-      <action id="NewCompactSourceFile" class="com.intellij.ide.actions.CreateCompactSourceFileAction"/>
       <action id="NewPackageInfo" class="com.intellij.ide.actions.CreatePackageInfoAction"/>
       <action id="NewModuleInfo" class="com.intellij.ide.actions.CreateModuleInfoAction"/>
       <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewDir"/>
     </group>
 
+    <action id="CompactSourceFile" class="com.intellij.ide.actions.CreateCompactSourceFileAction">
+      <add-to-group group-id="NewGroup1" anchor="after" relative-to-action="NewClass"/>
+    </action>
+
     <action id="InferNullity" class="com.intellij.codeInspection.inferNullity.InferNullityAnnotationsAction">
       <add-to-group group-id="AnalyzeActions" anchor="after" relative-to-action="ViewOfflineInspection"/>
     </action>