diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index 8458e5eb..022604d6 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -48,11 +48,12 @@
 
 // Extern Variables
 extern const char	*NSISW_VERSION;
-extern char			*g_script;
-extern HWND			g_hwnd;
-extern HANDLE		g_hThread;
-extern char			*g_output_exe;
-extern char			*g_input_script;
+extern char			  *g_script;
+extern HWND		  	g_hwnd;
+extern HANDLE	  	g_hThread;
+extern char		  	*g_output_exe;
+extern char			  *g_input_script;
+extern int	      g_retcode;
 
 // makensisw
 int WINAPI		WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow);
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index 04b7b00d..75dcf766 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -128,7 +128,7 @@ void EnableItems(HWND hwnd) {
   if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++;
 
 	HMENU m = GetMenu(hwnd);
-	if (g_output_exe) {
+	if (g_output_exe && !g_retcode) {
 			EnableWindow(GetDlgItem(hwnd,IDC_TEST),1);
 			EnableMenuItem(m,IDM_TEST,MF_ENABLED);
 	}