diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 69812506e48..b75a1816fdb 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2773,7 +2773,7 @@ tramp-completion-file-name-handler
   "Invoke Tramp file name completion handler for OPERATION and ARGS.
 Falls back to normal file name handler if no Tramp file name handler exists."
   (if-let
-      ((fn (and tramp-mode
+      ((fn (and tramp-mode minibuffer-completing-file-name
 		(assoc operation tramp-completion-file-name-handler-alist))))
       (save-match-data (apply (cdr fn) args))
     (tramp-run-real-handler operation args)))