diff --git a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
index b7e814d561..4fd30aa078 100644
--- a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
+++ b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
@@ -142,7 +142,6 @@ public:
 
         if (currentPeer != peer)
         {
-            removeFromParent();
             currentPeer = peer;
 
             if (peer != nullptr)
@@ -151,6 +150,10 @@ public:
                 [peerView addSubview: view];
                 componentMovedOrResized (false, false);
             }
+            else
+            {
+                removeFromParent();
+            }
         }
 
         [view setHidden: ! owner.isShowing()];