1 files changed, 7 insertions, 0 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 12850b0d1df..1b91915f4fb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -195,6 +195,7 @@ static int curs_y;
 
 /* Where the mouse was last time we reported a mouse event.  */
 static FRAME_PTR last_mouse_frame;
+static FRAME_PTR last_mouse_press_frame;
 static XRectangle last_mouse_glyph;
 
 /* The scroll bar in which the last X motion event occurred.
@@ -4047,6 +4048,12 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
                     && event.xbutton.same_screen)
                   {
                     SET_SAVED_BUTTON_EVENT;
+                    last_mouse_press_frame = f;
+                  }
+                else if (event.type == ButtonRelease)
+                  {
+                    if (!f) f = last_mouse_press_frame;
+                    SET_SAVED_BUTTON_EVENT;
                   }
                 else
                   goto OTHER;