diff --git a/lisp/ido.el b/lisp/ido.el
index 1bc9a4dcef7..efea9a9fbb9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2898,6 +2898,7 @@ If repeated, insert text from buffer instead."
     (when name
       (setq ido-text-init
 	    (if (or all
+		    (eq last-command this-command)
 		    (not (equal (file-name-directory bfname) ido-current-directory))
 		    (not (string-match "\\.[^.]*\\'" name)))
 		name