diff --git a/Resources/Locale/en-US/actions/actions/combat-mode.ftl b/Resources/Locale/en-US/actions/actions/combat-mode.ftl
index 0dad773258..bd15bd1d2f 100644
--- a/Resources/Locale/en-US/actions/actions/combat-mode.ftl
+++ b/Resources/Locale/en-US/actions/actions/combat-mode.ftl
@@ -2,5 +2,5 @@ action-name-combat = [color=red]Combat Mode[/color]
 action-description-combat = Enter combat mode.
 
 
-action-popup-combat = Combat mode enabled!
-action-popup-combat-disabling = Combat mode disabled.
\ No newline at end of file
+action-popup-combat = Combat mode disabled.
+action-popup-combat-enabled = Combat mode enabled!
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index e6948a8b66..f8175841b7 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -53,7 +53,7 @@
   icon: Interface/Actions/harmOff.png
   iconOn: Interface/Actions/harm.png
   userPopup: action-popup-combat
-  popupToggleSuffix: -disabling
+  popupToggleSuffix: -enabled
   event: !type:ToggleCombatActionEvent
 
 - type: instantAction