diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 9873a1f8..4418fc26 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -953,8 +953,12 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
         break;
         case IDLEFT:
         {
-          int index = SendDlgItemMessage(hwndDlg, IDC_SYMBOLS, LB_GETCURSEL, 0, 0);
-          if(index != LB_ERR) {
+          if (SendDlgItemMessage(hwndDlg, IDC_SYMBOLS, LB_GETSELCOUNT, 0, 0) != 1)
+            break;
+
+          int index;
+          int num = SendDlgItemMessage(hwndDlg, IDC_SYMBOLS, LB_GETSELITEMS, 1, (LPARAM) &index);
+          if(num == 1) {
             int n = SendDlgItemMessage(hwndDlg, IDC_SYMBOLS, LB_GETTEXTLEN, (WPARAM)index, 0);
             if(n > 0) {
               char *buf = (char *)GlobalAlloc(GPTR, (n+1)*sizeof(char));
@@ -1017,7 +1021,7 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
           }
           break;
         case IDC_SYMBOLS:
-          if(HIWORD(wParam) == LBN_SELCHANGE)
+          if (HIWORD(wParam) == LBN_SELCHANGE)
           {
             int n = SendDlgItemMessage(hwndDlg, IDC_SYMBOLS, LB_GETSELCOUNT, 0, 0);
             if(n == 0) {
@@ -1033,6 +1037,10 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
               EnableWindow(GetDlgItem(hwndDlg, IDDEL), TRUE);
             }
           }
+          else if (HIWORD(wParam) == LBN_DBLCLK)
+          {
+            SendDlgItemMessage(hwndDlg, IDLEFT, BM_CLICK, 0, 0);
+          }
           break;
         }
       break;
@@ -1187,6 +1195,14 @@ BOOL CALLBACK SymbolSetProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
               EnableWindow(GetDlgItem(hwndDlg, IDDEL), TRUE);
             }
           }
+          else if(HIWORD(wParam) == CBN_DBLCLK)
+          {
+            int n = SendDlgItemMessage(hwndDlg, IDC_NAMES, CB_GETCURSEL, 0, 0);
+            if (n != CB_ERR)
+            {
+              SendDlgItemMessage(hwndDlg, IDOK, BM_CLICK, 0, 0);
+            }
+          }
           break;
         }
       }
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 7b07ac59..7eee940c 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -26,7 +26,7 @@ Released on January 24th, 2004
 
 \S2{} Utilities and Plug-ins
 
-\b \L{../Contrib/Makensisw/Readme.txt}{MakeNSISW}: Fixed resize bug
+\b \L{../Contrib/Makensisw/Readme.txt}{MakeNSISW}: Fixed resize bug, added double click handling in settings window
 
 \b NSIS Update: Improved UI