Index: tramp.el
===================================================================
--- tramp.el	(revision 131)
+++ tramp.el	(revision 132)
@@ -4456,10 +4456,13 @@
    ((or (equal last-input-event 'tab)
 	;; Emacs
 	(and (integerp last-input-event)
-	     (not (event-modifiers last-input-event))
-	     (or (char-equal last-input-event ?\?)
-		 (char-equal last-input-event ?\t) ; handled by 'tab already?
-		 (char-equal last-input-event ?\ )))
+         (or
+          (and (equal (event-modifiers last-input-event) '(control))
+               (char-equal last-input-event ?\t))
+          (and (not (event-modifiers last-input-event))
+               (or (char-equal last-input-event ?\?)
+                   (char-equal last-input-event ?\t) ; handled by 'tab already?
+                   (char-equal last-input-event ?\ )))))
 	;; XEmacs
 	(and (featurep 'xemacs)
 	     (not (event-modifiers last-input-event))