diff --git a/src/gui_w48.c b/src/gui_w48.c
index 42cf91f..b391a0d 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -290,6 +290,11 @@
 
 /* Local variables */
 static int		s_button_pending = -1;
+
+/* s_getting_focus is set when we got focus but didn't see mouse-up event yet,
+ * so don't reset s_button_pending. */
+static int		s_getting_focus = FALSE;
+
 static int		s_x_pending;
 static int		s_y_pending;
 static UINT		s_kFlags_pending;
@@ -671,6 +676,8 @@
 {
     int vim_modifiers = 0x0;
 
+    s_getting_focus = FALSE;
+
     if (keyFlags & MK_SHIFT)
 	vim_modifiers |= MOUSE_SHIFT;
     if (keyFlags & MK_CONTROL)
@@ -792,6 +799,7 @@
 {
     int button;
 
+    s_getting_focus = FALSE;
     if (s_button_pending > -1)
     {
 	/* Delayed action for mouse down event */
@@ -1951,8 +1959,10 @@
 	    allow_scrollbar = FALSE;
 
 	    /* Clear pending mouse button, the release event may have been
-	     * taken by the dialog window. */
-	    s_button_pending = -1;
+	     * taken by the dialog window.  But don't do this when getting
+	     * focus, we need the mouse-up event then. */
+	    if (!s_getting_focus)
+		s_button_pending = -1;
 
 	    return OK;
 	}
@@ -2702,6 +2712,7 @@
     HWND hwndOldFocus)
 {
     gui_focus_change(TRUE);
+    s_getting_focus = TRUE;
     (void)MyWindowProc(hwnd, WM_SETFOCUS, (WPARAM)hwndOldFocus, 0);
 }
 
@@ -2711,6 +2722,7 @@
     HWND hwndNewFocus)
 {
     gui_focus_change(FALSE);
+    s_getting_focus = FALSE;
     (void)MyWindowProc(hwnd, WM_KILLFOCUS, (WPARAM)hwndNewFocus, 0);
 }
 
diff --git a/src/version.c b/src/version.c
index 975b4bb..1ae453c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    168,
+/**/
     167,
 /**/
     166,