diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index f6da239e..fe9f3576 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -1107,10 +1107,12 @@ BOOL CALLBACK SymbolSetProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
       SendMessage(hwndEdit, EM_LIMITTEXT, (WPARAM)SYMBOL_SET_NAME_MAXLEN, 0);
       if(g_symbol_set_mode == 1) { //Load
         SetWindowText(hwndDlg, LOAD_SYMBOL_SET_DLG_NAME);
+        SetWindowText(GetDlgItem(hwndDlg, IDOK), LOAD_BUTTON_TEXT);
         SendMessage(hwndEdit, EM_SETREADONLY, (WPARAM)TRUE, 0);
       }
       else {
         SetWindowText(hwndDlg, SAVE_SYMBOL_SET_DLG_NAME);
+        SetWindowText(GetDlgItem(hwndDlg, IDOK), SAVE_BUTTON_TEXT);
       }
       break;
     }
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index 5e8b478b..782c2341 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -63,8 +63,10 @@
 #define SYMBOL_SET_NAME_MAXLEN 40
 #define LOAD_SYMBOL_SET_DLG_NAME "Load Symbol Definitions Set"
 #define SAVE_SYMBOL_SET_DLG_NAME "Save Symbol Definitions Set"
+#define LOAD_BUTTON_TEXT "Load"
+#define SAVE_BUTTON_TEXT "Save"
 #define LOAD_SYMBOL_SET_MESSAGE "Please select a name for the Symbol Definitions Set to load."
-#define SAVE_SYMBOL_SET_MESSAGE "Please enter a name for the Symbol Definitions Set to save."
+#define SAVE_SYMBOL_SET_MESSAGE "Please enter or select a name for the Symbol Definitions Set to save."
 
 #define WM_MAKENSIS_PROCESSCOMPLETE (WM_USER+1001)
 #define WM_MAKENSIS_LOADSYMBOLSET (WM_USER+1002)