diff --git a/src/net/azib/ipscan/Main.java b/src/net/azib/ipscan/Main.java
index aea5647a..e627fb29 100644
--- a/src/net/azib/ipscan/Main.java
+++ b/src/net/azib/ipscan/Main.java
@@ -59,12 +59,13 @@ public class Main {
 			LOG.finer("Labels and Config initialized after " + (System.currentTimeMillis() - startTime));
 
 			MainComponent mainComponent = DaggerMainComponent.create();
-			LOG.finer("ComponentRegistry initialized after " + (System.currentTimeMillis() - startTime));
+			if (Platform.MAC_OS) mainComponent.createMacApplicationMenu();
+			LOG.finer("Components initialized after " + (System.currentTimeMillis() - startTime));
 
 			processCommandLine(args, mainComponent);
 
 			// create the main window using dependency injection
-			MainWindow mainWindow = mainComponent.getMainWindow();
+			MainWindow mainWindow = mainComponent.createMainWindow();
 			LOG.fine("Startup time: " + (System.currentTimeMillis() - startTime));
 
 			while (!mainWindow.isDisposed()) {
@@ -118,7 +119,7 @@ public class Main {
 
 	private static void processCommandLine(String[] args, MainComponent mainComponent) {
 		if (args.length != 0) {
-			CommandLineProcessor cli = mainComponent.getCommandLineProcessor();
+			CommandLineProcessor cli = mainComponent.createCommandLineProcessor();
 			try {
 				cli.parse(args);
 			}
diff --git a/src/net/azib/ipscan/config/MainComponent.java b/src/net/azib/ipscan/config/MainComponent.java
index 11b4f3b2..3d799d9a 100644
--- a/src/net/azib/ipscan/config/MainComponent.java
+++ b/src/net/azib/ipscan/config/MainComponent.java
@@ -15,7 +15,7 @@ import javax.inject.Singleton;
 })
 @Singleton
 public interface MainComponent {
-	MainWindow getMainWindow();
-	MacApplicationMenu getMacApplicationMenu();
-	CommandLineProcessor getCommandLineProcessor();
+	MainWindow createMainWindow();
+	MacApplicationMenu createMacApplicationMenu();
+	CommandLineProcessor createCommandLineProcessor();
 }
diff --git a/src/net/azib/ipscan/gui/MacApplicationMenu.java b/src/net/azib/ipscan/gui/MacApplicationMenu.java
index 29d6ae0d..4910c039 100644
--- a/src/net/azib/ipscan/gui/MacApplicationMenu.java
+++ b/src/net/azib/ipscan/gui/MacApplicationMenu.java
@@ -16,7 +16,6 @@ import javax.inject.Inject;
  * in order to conform better to Mac standards.
  */
 public class MacApplicationMenu {
-
 	@Inject AboutDialog aboutDialog;
 	@Inject PreferencesDialog preferencesDialog;
 	@Inject SelectFetchersDialog selectFetchersDialog;