diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbdd5cd6ca5..d0c4ff7c913 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-26  Micha,bk(Bl Cadilhac  <michael@cadilhac.name>
+
+	* hi-lock.el (hi-lock-unface-buffer): Show a x-menu only if the mouse
+	was used.
+
 2007-08-26  Sean O'Rourke  <seano@cs.ucsd.edu>
 
 	* complete.el (PC-do-completion): Make RET accept a non-unique but
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 522a50b9a7f..b5e62e7a909 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -462,7 +462,7 @@ interactive functions.  \(See `hi-lock-interactive-patterns'.\)
 \\<minibuffer-local-must-match-map>Use \\[minibuffer-complete] to complete a partially typed regexp.
 \(See info node `Minibuffer History'.\)"
   (interactive
-   (if (and (display-popup-menus-p) (vectorp (this-command-keys)))
+   (if (and (display-popup-menus-p) (not last-nonmenu-event))
        (catch 'snafu
 	 (or
 	  (x-popup-menu