diff --git a/ftplugin/drupal.vim b/ftplugin/drupal.vim
index db269fe..922f19b 100644
--- a/ftplugin/drupal.vim
+++ b/ftplugin/drupal.vim
@@ -29,7 +29,7 @@ augroup Drupal
   autocmd BufEnter <buffer> if strlen(b:Drupal_info.DRUPAL_ROOT) |
 	\ let $DRUPAL_ROOT = b:Drupal_info.DRUPAL_ROOT | endif
 augroup END
-do BufEnter <buffer>
+do Drupal BufEnter <buffer>
 " }}}
 
 " The tags file can be used for PHP omnicompletion even if $DRUPAL_ROOT == ''.
diff --git a/plugin/drupal.vim b/plugin/drupal.vim
index 32f3fca..47a0247 100644
--- a/plugin/drupal.vim
+++ b/plugin/drupal.vim
@@ -150,7 +150,7 @@ function! s:DrupalRoot(path)
   for part in split(matchstr(a:path, '\' . s:slash . '.*'), s:slash)
     let droot .= s:slash . part
     " This would be easier if it did not have to work on Windows.
-    let ls = glob(droot . s:slash . '*')
+    let ls = glob(droot . s:slash . '*') . "\<C-J>"
     let is_drupal_root = 1
     for marker in markers
       if match(ls, '\' . s:slash . marker . "\<C-J>") == -1