diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index a7d1386e595c..dc3cfde8c77f 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -77,18 +77,6 @@
     <group id="NewProjectOrModuleGroup">
     </group>
 
-    <group id="PrintExportGroup">
-      <separator/>
-      <group id="FileExportGroup" popup="true">
-        <action id="ExportToHTML" class="com.intellij.codeEditor.printing.ExportToHTMLAction">
-          <override-text place="MainMenu"/>
-        </action>
-      </group>
-      <action id="Print" class="com.intellij.codeEditor.printing.PrintAction" icon="AllIcons.General.Print"/>
-
-      <add-to-group group-id="FileMenu" anchor="after" relative-to-action="FileMainSettingsGroup"/>
-    </group>
-
     <reference ref="AddToFavorites">
       <add-to-group group-id="FileMenu" anchor="after" relative-to-action="PrintExportGroup"/>
     </reference>
@@ -99,12 +87,6 @@
       <add-to-group group-id="EditorTabPopupMenu" anchor="after" relative-to-action="CopyReference"/>
     </action>
 
-    <group id="PowerSaveGroup">
-      <separator/>
-      <action id="TogglePowerSave" class="com.intellij.ide.actions.TogglePowerSaveAction"/>
-      <add-to-group group-id="FileMenu" anchor="after" relative-to-action="FileMainSettingsGroup"/>
-    </group>
-
     <!-- Edit -->
     <action id="CopyReference" class="com.intellij.ide.actions.CopyReferenceAction">
       <add-to-group group-id="CopyGroup" anchor="after" relative-to-action="CopyPaths"/>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 34e09f2c184d..4ed11ebe4726 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -521,6 +521,9 @@
           <action id="CloseProject" class="com.intellij.ide.actions.CloseProjectAction"/>
         </group>
         <separator/>
+        <group id="FileMainSettingsGroup">
+          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction"/>
+        </group>
         <group id="FilePropertiesGroup" popup="true">
           <action id="ChangeFileEncodingAction" class="com.intellij.openapi.vfs.encoding.ChangeFileEncodingAction"/>
           <action id="AssociateWithFileType" class="com.intellij.ide.actions.AssociateFileTypeAction"/>
@@ -542,14 +545,24 @@
           <action id="ImportSettings" class="com.intellij.configurationStore.ImportSettingsAction"/>
           <action id="ExportSettings" class="com.intellij.configurationStore.ExportSettingsAction"/>
         </group>
-        <group id="FileMainSettingsGroup">
-          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction"/>
-          <group id="FileOtherSettingsGroup" class="com.intellij.ide.actions.SmartPopupActionGroup">
-            <action id="TemplateProjectProperties" class="com.intellij.ide.actions.TemplateProjectPropertiesAction"/>
-            <reference ref="RunConfigurationTemplatesForNewProjects"/>
-            <group id="FileSettingsGroup"/>
-          </group>
+        <group id="FileOtherSettingsGroup" class="com.intellij.ide.actions.SmartPopupActionGroup">
+          <action id="TemplateProjectProperties" class="com.intellij.ide.actions.TemplateProjectPropertiesAction"/>
+          <reference ref="RunConfigurationTemplatesForNewProjects"/>
+          <group id="FileSettingsGroup"/>
+        </group>
+        <separator/>
+        <group id="PrintExportGroup">
           <separator/>
+          <group id="FileExportGroup" popup="true">
+            <action id="ExportToHTML" class="com.intellij.codeEditor.printing.ExportToHTMLAction">
+              <override-text place="MainMenu"/>
+            </action>
+          </group>
+          <action id="Print" class="com.intellij.codeEditor.printing.PrintAction" icon="AllIcons.General.Print"/>
+        </group>
+        <group id="PowerSaveGroup">
+          <separator/>
+          <action id="TogglePowerSave" class="com.intellij.ide.actions.TogglePowerSaveAction"/>
         </group>
         <separator/>
         <action id="Exit" class="com.intellij.ide.actions.ExitAction"/>
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index ea9250d01eb6..25f4669810da 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -36,7 +36,7 @@
 
     <action id="ShowProjectStructureSettings" class="com.intellij.ide.actions.ShowStructureSettingsAction"
             icon="AllIcons.General.ProjectStructure">
-      <add-to-group group-id="FileMenu" anchor="before" relative-to-action="FilePropertiesGroup"/>
+      <add-to-group group-id="FileMainSettingsGroup" anchor="after" relative-to-action="ShowSettings"/>
       <add-to-group group-id="MainToolBarSettings" anchor="after" relative-to-action="ShowSettings"/>
       <add-to-group group-id="NavBarToolBar" relative-to-action="NavBarToolBarOthers" anchor="after"/>
     </action>