diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 5e0a0f4c..ed4f829c 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -983,6 +983,8 @@ class AppWindow(object):
         if play_sound and play_bad:
             hotkeymgr.play_bad()
 
+        self.update_suit_text()
+        self.suit_show_if_set()
         self.cooldown()
 
     def journal_event(self, event):  # noqa: C901, CCR001 # Currently not easily broken up.
diff --git a/companion.py b/companion.py
index 953e5fb4..72dafc70 100644
--- a/companion.py
+++ b/companion.py
@@ -688,6 +688,9 @@ class Session(object):
         else:
             monitor.state['Suits'] = suits
 
+        # We need to be setting our edmcName for all suits
+        monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(monitor.state['SuitCurrent']['locName'])
+
         if (suit_loadouts := data.get('loadouts')) is None:
             logger.warning('CAPI data had "suit" but no (suit) "loadouts"')