diff --git a/kivy/uix/filechooser.py b/kivy/uix/filechooser.py
index e6fed9b73..d8ffc6f51 100644
--- a/kivy/uix/filechooser.py
+++ b/kivy/uix/filechooser.py
@@ -217,7 +217,10 @@ class FileChooserController(FloatLayout):
             if isdir(entry.path) and not self.dirselect:
                 self.open_entry(entry)
             elif touch.is_double_tap:
-                self.dispatch('on_submit', self.selection, touch)
+                if self.dirselect and isdir(entry.path):
+                    self.open_entry(entry)
+                else:
+                    self.dispatch('on_submit', self.selection, touch)
 
     def open_entry(self, entry):
         try: