diff --git a/python/completers/general/filename_completer.py b/python/completers/general/filename_completer.py
index 01af4382..d81b6658 100644
--- a/python/completers/general/filename_completer.py
+++ b/python/completers/general/filename_completer.py
@@ -126,7 +126,8 @@ def GetPathsStandardCase( path_dir ):
 def GenerateCandidatesForPaths( absolute_paths ):
   def GenerateCandidateForPath( absolute_path ):
     is_dir = os.path.isdir( absolute_path )
-    return { 'word': os.path.basename( absolute_path ),
+    basename = os.path.basename( absolute_path )
+    return { 'word': basename + '/' if is_dir else basename ,
               'dup': 1,
               'menu': '[Dir]' if is_dir else '[File]' }