diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index eb990881c903..a2b7e8fdac21 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -2847,7 +2847,7 @@ action.AddConditionalBreakpoint.text=Add Conditional Breakpoint\u2026
 group.XDebugger.Attach.Dialog.Settings.text=Attach dialog settings
 
 action.XDebugger.Show.Breakpoints.Over.Line.Numbers.text=Breakpoints Over Line Numbers
-action.XDebugger.Hotswap.Modified.Files.text=Compile And Reload Modified Files
+action.XDebugger.Hotswap.Modified.Files.text=Compile and Reload Modified Files
 action.XDebugger.Hotswap.Modified.Files.description=Recompile files modified during a debugger session and perform hot swap
 
 action.main.toolbar.Project.text=Project Widget
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index 84dc0c8b682d..4817ce9f30fb 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -373,9 +373,7 @@
          correctly labeled -->
     <action id="AnonymousToInner" class="com.intellij.refactoring.actions.AnonymousToInnerAction"/>
 
-    <action id="Hotswap" class="com.intellij.debugger.actions.HotSwapAction">
-      <add-to-group group-id="DebugReloadGroup" anchor="last"/>
-    </action>
+    <action id="Hotswap" class="com.intellij.debugger.actions.HotSwapAction"/>
 
     <action id="RunToolbarHotSwapAction" class="com.intellij.debugger.actions.RunToolbarHotSwapAction" icon="com.intellij.icons.AllIcons.Actions.BuildAutoReloadChanges">
       <add-to-group group-id="RunToolbarAdditionalProcessActions"/>
@@ -583,7 +581,7 @@
     <group id="EditorPopupMenuDebugJava">
       <separator/>
       <reference ref="ToggleFieldBreakpoint"/>
-      <reference ref="Debugger.ReloadFile"/>
+      <reference ref="XDebugger.Hotswap.Modified.Files"/>
       <separator/>
       <add-to-group group-id="EditorPopupMenuDebug" anchor="last"/>
     </group>