diff --git a/src/gui_w32.c b/src/gui_w32.c
index d6aa1a503b..092d8d516e 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2894,6 +2894,10 @@ dialog_callback(
 	(void)SetFocus(hwnd);
 	if (dialog_default_button > IDCANCEL)
 	    (void)SetFocus(GetDlgItem(hwnd, dialog_default_button));
+	else
+	    /* We don't have a default, set focus on another element of the
+	     * dialog window, probably the icon */
+	    (void)SetFocus(GetDlgItem(hwnd, DLG_NONBUTTON_CONTROL));
 	return FALSE;
     }
 
diff --git a/src/version.c b/src/version.c
index fce1bcd28c..999621cddf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    70,
 /**/
     69,
 /**/