diff --git a/lisp/simple.el b/lisp/simple.el
index 62578bdfa6e..67f0edb2628 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3922,8 +3922,7 @@ The completion list buffer is available as the value of `standard-output'.")
       (completion-list-mode)
       (make-local-variable 'completion-reference-buffer)
       (setq completion-reference-buffer mainbuf)
-      (if (memq minibuffer-completion-table
-		'(ffap-read-file-or-url-internal read-file-name-internal))
+      (if minibuffer-completing-file-name
 	  ;; For file name completion,
 	  ;; use the number of chars before the start of the
 	  ;; last file name component.