diff --git a/extras/Projucer/Source/Application/jucer_MainWindow.cpp b/extras/Projucer/Source/Application/jucer_MainWindow.cpp
index 023a8f06ec..2707573078 100644
--- a/extras/Projucer/Source/Application/jucer_MainWindow.cpp
+++ b/extras/Projucer/Source/Application/jucer_MainWindow.cpp
@@ -53,6 +53,8 @@ public:
 
         static_cast<Component&> (mainWindow).addChildComponent (this);
         componentMovedOrResized (true, true);
+
+        enterModalState();
     }
 
     void resized() override
@@ -67,6 +69,11 @@ public:
         g.drawImage (componentImage, getLocalBounds().toFloat());
     }
 
+    void inputAttemptWhenModal() override
+    {
+        mainWindow.hideLoginFormOverlay();
+    }
+
 private:
     void componentPeerChanged() override                {}
 
@@ -92,7 +99,8 @@ private:
 
     void refreshBackgroundImage()
     {
-        setVisible (false);
+        setAlwaysOnTop (false);
+        toBack();
 
         auto parentBounds = mainWindow.getBounds();
 
@@ -102,7 +110,8 @@ private:
 
         kernel.applyToImage (componentImage, componentImage, getLocalBounds());
 
-        setVisible (true);
+        setAlwaysOnTop (true);
+        toFront (true);
     }
 
     //==============================================================================
@@ -479,10 +488,6 @@ void MainWindow::showLoginFormOverlay()
 {
     blurOverlayComponent = std::make_unique<BlurOverlayWithComponent> (*this, std::make_unique<LoginFormComponent> (*this));
     loginFormOpen = true;
-
-    if (auto* loginForm = blurOverlayComponent->getChildComponent (0))
-        if (auto* handler = loginForm->getAccessibilityHandler())
-            handler->grabFocus();
 }
 
 void MainWindow::hideLoginFormOverlay()