diff --git a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
index 3e2cac4358..20584e8f9d 100644
--- a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
+++ b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
@@ -75,10 +75,11 @@ AccessibilityHandler::~AccessibilityHandler()
 //==============================================================================
 AccessibleState AccessibilityHandler::getCurrentState() const
 {
-    AccessibleState state;
+    if (component.isCurrentlyBlockedByAnotherModalComponent()
+        && Component::getCurrentlyModalComponent()->isVisible())
+        return {};
 
-    if (! component.isCurrentlyBlockedByAnotherModalComponent())
-        state = state.withFocusable();
+    auto state = AccessibleState().withFocusable();
 
     return hasFocus (false) ? state.withFocused() : state;
 }