diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index b57744f9..bb8c38ac 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -570,7 +570,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
           }
           return TRUE;
         }
-        case IDC_CLOSE:
+        case IDCANCEL:
         case IDM_EXIT:
         {
           if (!g_sdata.thread) {
@@ -752,7 +752,7 @@ BOOL CALLBACK DialogResize(HWND hWnd, LPARAM /* unused */)
         SetWindowPos(hWnd, 0, r.left, r.top,r.right - r.left + g_resize.dx, r.bottom - r.top + g_resize.dy, SWP_NOZORDER|SWP_NOMOVE);
         break;
       case IDC_TEST:
-      case IDC_CLOSE:
+      case IDCANCEL:
         SetWindowPos(hWnd, 0, r.left + g_resize.dx, r.top + g_resize.dy, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
         break;
       default:
diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h
index 80ea742b..e6e23b5c 100644
--- a/Contrib/Makensisw/resource.h
+++ b/Contrib/Makensisw/resource.h
@@ -48,7 +48,6 @@
 #define IDB_TOOLBAR24H                  132
 #define IDC_LOGWIN                      402
 #define IDC_VERSION                     405
-#define IDC_CLOSE                       406
 #define IDM_ABOUT                       501
 #define IDM_EXIT                        502
 #define IDM_SAVE                        503
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 368bb8f8..d0a1bfc8 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -165,7 +165,7 @@ BEGIN
                     WS_BORDER | WS_VSCROLL,7,22,345,186
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1
     LTEXT           "",IDC_VERSION,7,230,200,12,WS_DISABLED
-    DEFPUSHBUTTON   "&Close",IDC_CLOSE,296,226,49,15
+    DEFPUSHBUTTON   "&Close",IDCANCEL,296,226,49,15
     PUSHBUTTON      "Test &Installer",IDC_TEST,230,226,60,15,WS_DISABLED
 END
 
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index 45446123..4c8a0581 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -168,9 +168,9 @@ void Items(HWND hwnd, int on){
       g_sdata.focused_hwnd = GetFocus();
   // Altered by Darren Owen (DrO) on 6/10/2003
   else
-    EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1);
+    EnableWindow(GetDlgItem(hwnd,IDCANCEL),1);
 
-  EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),on);
+  EnableWindow(GetDlgItem(hwnd,IDCANCEL),on);
   // Altered by Darren Owen (DrO) on 6/10/2003
   if((!g_sdata.retcode && on) || !on)
     EnableWindow(GetDlgItem(hwnd,IDC_TEST),on);
@@ -592,7 +592,7 @@ void InitTooltips(HWND h) {
   g_tip.tip = CreateWindowEx(dwExStyle,TOOLTIPS_CLASS,NULL,dwStyle,0,0,0,0,h,NULL,GetModuleHandle(NULL),NULL);
   if (!g_tip.tip) return;
   g_tip.hook = SetWindowsHookEx(WH_GETMESSAGE,TipHookProc,NULL, GetCurrentThreadId());
-  AddTip(GetDlgItem(h,IDC_CLOSE),TEXT("Close MakeNSISW"));
+  AddTip(GetDlgItem(h,IDCANCEL),TEXT("Close MakeNSISW"));
   AddTip(GetDlgItem(h,IDC_TEST),TEXT("Test the installer generated by MakeNSISW"));
   AddToolBarTooltips();
 }