diff --git a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
index 660c8d7c98..dc36d46ef5 100644
--- a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
+++ b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
@@ -319,8 +319,12 @@ void AccessibilityHandler::takeFocus()
     currentlyFocusedHandler = this;
     notifyAccessibilityEventInternal (*this, InternalAccessibilityEvent::focusChanged);
 
-    if (component.getWantsKeyboardFocus() && ! component.hasKeyboardFocus (true))
+    if ((component.isShowing() || component.isOnDesktop())
+        && component.getWantsKeyboardFocus()
+        && ! component.hasKeyboardFocus (true))
+    {
         component.grabKeyboardFocus();
+    }
 }
 
 //==============================================================================