diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 4ae66d90..2a915667 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -164,9 +164,6 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
 		case WM_SIZE:
 		{
 			if ((wParam == SIZE_MAXHIDE)||(wParam == SIZE_MAXSHOW)) return TRUE;
-		}
-		case WM_SIZING:
-		{
 			RECT rSize;
 			if (hwndDlg == g_hwnd) {
 				GetClientRect(g_hwnd, &rSize);
@@ -175,13 +172,17 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
 				dy = rSize.bottom - resizeRect.bottom;
 				EnumChildWindows(g_hwnd, DialogResize, (LPARAM)0);
 				resizeRect = rSize;
-				GetClientRect(g_hwnd, &g_griprect);
-				g_griprect.left = g_griprect.right - GetSystemMetrics(SM_CXVSCROLL);
-				g_griprect.top = g_griprect.bottom - GetSystemMetrics(SM_CYVSCROLL);
-				InvalidateRect(g_hwnd,&g_griprect,TRUE);
 			}
-			 return TRUE;
-		 }
+			return TRUE;
+		}
+		case WM_SIZING:
+		{
+			InvalidateRect(g_hwnd,&g_griprect,TRUE);
+			GetClientRect(g_hwnd, &g_griprect);
+			g_griprect.left = g_griprect.right - GetSystemMetrics(SM_CXVSCROLL);
+			g_griprect.top = g_griprect.bottom - GetSystemMetrics(SM_CYVSCROLL);
+			return TRUE;
+		}
 		case WM_MAKENSIS_PROCESSCOMPLETE:
 		{
 			if (g_hThread) {
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 65b063b2..93c23495 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -141,8 +141,8 @@ BEGIN
                     WS_VSCROLL,7,4,345,186
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,202,346,1
     LTEXT           "",IDC_VERSION,7,212,200,12,WS_DISABLED
-    DEFPUSHBUTTON   "Clo&se",IDC_CLOSE,301,208,49,15
-    PUSHBUTTON      "&Test",IDC_TEST,245,208,50,15,WS_DISABLED
+    DEFPUSHBUTTON   "Clo&se",IDC_CLOSE,296,208,49,15
+    PUSHBUTTON      "&Test",IDC_TEST,240,208,50,15,WS_DISABLED
 END
 
 DLG_ABOUT DIALOG DISCARDABLE  0, 0, 235, 86