diff --git a/extras/audio plugin host/Source/HostStartup.cpp b/extras/audio plugin host/Source/HostStartup.cpp
index 49d83bacf3..4745e3751e 100644
--- a/extras/audio plugin host/Source/HostStartup.cpp	
+++ b/extras/audio plugin host/Source/HostStartup.cpp	
@@ -73,7 +73,7 @@ public:
         if (commandLine.isNotEmpty() && mainWindow->getGraphEditor() != 0)
         {
            #if JUCE_MAC
-            if (! commandLine.trimStart().startsWith ("-psn"))
+            if (! commandLine.trimStart().startsWith ("-"))
            #endif
                 mainWindow->getGraphEditor()->graph.loadFrom (File::getCurrentWorkingDirectory()
                                                                 .getChildFile (commandLine), true);
diff --git a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
index a6a726ebcf..5deaf6dc25 100644
--- a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
+++ b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
@@ -96,6 +96,14 @@ public:
 
             embeddedView = attachView (wrapperWindow, HIViewGetRoot (wrapperWindow));
 
+            // Check for the plugin creating its own floating window, and if there is one,
+            // we need to reparent it to make it visible..
+            NSWindow* floatingChildWindow = [[carbonWindow childWindows] objectAtIndex: 0];
+
+            if (floatingChildWindow != nil)
+                [getOwnerWindow() addChildWindow: c
+                                         ordered: NSWindowAbove];
+
             EventTypeSpec windowEventTypes[] =
             {
                 { kEventClassWindow, kEventWindowGetClickActivation },