diff --git a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp
index 4f33df2271..6f7d5c2c8d 100644
--- a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp
@@ -569,9 +569,15 @@ std::unique_ptr<AccessibilityHandler> TableListBox::createAccessibilityHandler()
 
         const AccessibilityHandler* getCellHandler (int row, int column) const override
         {
-            if (isPositiveAndBelow (row, getNumRows()) && isPositiveAndBelow (column, getNumColumns()))
-                if (auto* cellComponent = tableListBox.getCellComponent (tableListBox.getHeader().getColumnIdOfIndex (column, false), row))
-                    return cellComponent->getAccessibilityHandler();
+            if (isPositiveAndBelow (row, getNumRows()))
+            {
+                if (isPositiveAndBelow (column, getNumColumns()))
+                    if (auto* cellComponent = tableListBox.getCellComponent (tableListBox.getHeader().getColumnIdOfIndex (column, false), row))
+                        return cellComponent->getAccessibilityHandler();
+
+                if (auto* rowComp = tableListBox.getComponentForRowNumber (row))
+                    return rowComp->getAccessibilityHandler();
+            }
 
             return nullptr;
         }