diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f7577fa829..a2ed50e4b6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-drag-mode-line-1): Make sure that if we push
+	mouse-2 into unread-command-events, it is interpreted correctly.
+
 2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* image-mode.el (image-type, image-mode-map, image-minor-mode-map)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index bed4776c135..628f900e886 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -538,6 +538,9 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
         ;; a `drag-mouse-1'.  In any case `on-link' would have been nulled
         ;; above if there had been any significant mouse movement.
         (when (and on-link (eq 'mouse-1 (car-safe event)))
+	  ;; If mouse-2 has never been done by the user, it doesn't
+	  ;; have the necessary property to be interpreted correctly.
+	  (put 'mouse-2 'event-kind 'mouse-click)
           (push (cons 'mouse-2 (cdr event)) unread-command-events))))))
 
 (defun mouse-drag-mode-line (start-event)