diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
index 011784b95..e12526d40 100644
--- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
+++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
@@ -250,7 +250,6 @@ public class GUIUtil {
 		try {
 			// Set system L&F
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-			UIManager.put("TabbedPane.foreground", Color.black);
 			
 			// Check whether we have an ugly L&F
 			LookAndFeel laf = UIManager.getLookAndFeel();
diff --git a/swing/src/net/sf/openrocket/startup/OSXSetup.java b/swing/src/net/sf/openrocket/startup/OSXSetup.java
index cbd40cb80..3ca0a20f4 100644
--- a/swing/src/net/sf/openrocket/startup/OSXSetup.java
+++ b/swing/src/net/sf/openrocket/startup/OSXSetup.java
@@ -1,9 +1,6 @@
 package net.sf.openrocket.startup;
 
-import java.awt.Desktop;
-import java.awt.Image;
-import java.awt.Taskbar;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.desktop.AboutHandler;
 import java.awt.desktop.PreferencesHandler;
 import java.awt.desktop.QuitHandler;
@@ -17,6 +14,8 @@ import net.sf.openrocket.gui.dialogs.AboutDialog;
 import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog;
 import net.sf.openrocket.gui.main.BasicFrame;
 
+import javax.swing.*;
+
 /**
  * Static code for initialization of OSX UI Elements: Menu, Icon, Name and
  * Application menu handlers.
@@ -91,6 +90,9 @@ final class OSXSetup {
 			final Taskbar osxTaskbar = Taskbar.getTaskbar();
 			osxTaskbar.setIconImage(dockIcon);
 
+			// Set the foreground of active tabs to black; there was a bug where you had a white background and white foreground
+			UIManager.put("TabbedPane.foreground", Color.black);
+
 		} catch (final Throwable t) {
 			// None of the preceding is critical to the app,
 			// so at worst case log an error and continue