diff --git a/src/gui_w48.c b/src/gui_w48.c
index 783fca7..353b7a6 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2405,8 +2405,7 @@
 		tiw.mask = TCIF_TEXT;
 		tiw.iImage = -1;
 		tiw.pszText = wstr;
-		SendMessage(s_tabhwnd, TCM_INSERTITEMW, (WPARAM)nr,
-								(LPARAM)&tiw);
+		SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw);
 		vim_free(wstr);
 	    }
 	}
@@ -3033,13 +3032,25 @@
     return OK;
 }
 
+#ifndef WPF_RESTORETOMAXIMIZED
+# define WPF_RESTORETOMAXIMIZED 2   /* just in case someone doesn't have it */
+#endif
+
 /*
  * Return TRUE if the GUI window is maximized, filling the whole screen.
  */
     int
 gui_mch_maximized()
 {
-    return IsZoomed(s_hwnd);
+    WINDOWPLACEMENT wp;
+
+    wp.length = sizeof(WINDOWPLACEMENT);
+    if (GetWindowPlacement(s_hwnd, &wp))
+	return wp.showCmd == SW_SHOWMAXIMIZED
+	    || (wp.showCmd == SW_SHOWMINIMIZED
+		    && wp.flags == WPF_RESTORETOMAXIMIZED);
+
+    return 0;
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index e881654..d03ef12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    170,
+/**/
     169,
 /**/
     168,