diff --git a/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java b/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java
index 6406d3516..c9229887c 100644
--- a/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java
+++ b/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java
@@ -8,6 +8,8 @@ import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.Graphics;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 
 public class SelectColorButton extends JButton {
     public SelectColorButton() {
@@ -53,5 +55,13 @@ public class SelectColorButton extends JButton {
                 }
             }
         });
+
+        // Need to add this, otherwise the foreground can remain in the selectForeground state when the button is clicked
+        addFocusListener(new FocusAdapter() {
+            @Override
+            public void focusLost(FocusEvent e) {
+                setForeground(UIManager.getColor("Button.foreground"));
+            }
+        });
     }
 }