diff --git a/kivy/uix/filechooser.py b/kivy/uix/filechooser.py
index 3fb8bdcd7..3160114c2 100644
--- a/kivy/uix/filechooser.py
+++ b/kivy/uix/filechooser.py
@@ -547,6 +547,9 @@ class FileChooserController(FloatLayout):
             except StopIteration:
                 finished = True
                 break
+            except TypeError:  # in case _gitems_gen is None
+                finished = True
+                break
 
         # if this wasn't enough for creating all the entries, show a progress
         # bar, and report the activity to the user.