diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/FirmwareAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/FirmwareAction.java
index edae8a52ad..000bf088e9 100644
--- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/FirmwareAction.java
+++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/FirmwareAction.java
@@ -95,10 +95,10 @@ public Component getToolbarPresenter() {
             panel.add(firmwareCombo);
             c = panel;
 
-            firmwareCombo.addActionListener(a -> setFirmware());
-
             // Baud rate options.
             loadFirmwareSelector();
+
+            firmwareCombo.addActionListener(a -> setFirmware());
         }
         return c;
     }