diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 136ff1d3..1253e379 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -969,6 +969,8 @@ void showCfgDlg()
   ShowWindow(hConfigWindow, SW_SHOWNA);
 	SetFocus(hNextButton);
 
+  LockWindowUpdate(0);
+
   g_done=0;
 
 	while (!g_done) {
diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c
index 4926dca0..5e283839 100644
--- a/Contrib/StartMenu/StartMenu.c
+++ b/Contrib/StartMenu/StartMenu.c
@@ -98,6 +98,8 @@ void __declspec(dllexport) Select(HWND hwndParent, int string_size, char *variab
       lpWndProcOld = (void *) SetWindowLong(hwndParent, GWL_WNDPROC, (long) ParentWndProc);
     }
 
+    LockWindowUpdate(0);
+
     while (!g_done)
     {
       MSG msg;
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 0dd4f6f8..f45fca31 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ
diff --git a/Plugins/StartMenu.dll b/Plugins/StartMenu.dll
index c068b467..d82c2e8e 100644
Binary files a/Plugins/StartMenu.dll and b/Plugins/StartMenu.dll differ
diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index 86534392..6bdd4d83 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -509,6 +509,8 @@ nextPage:
     {
       HWND hwndtmp;
 
+      LockWindowUpdate(g_hwnd);
+
       SetDlgItemTextFromLang(hwndDlg,IDOK,this_page->next);
       
       hwndtmp=GetDlgItem(hwndDlg,IDC_BACK);
@@ -518,9 +520,10 @@ nextPage:
       if (this_page->id!=NSIS_PAGE_COMPLETED) DestroyWindow(m_curwnd);
       else if (g_autoclose) goto nextPage;
 
+      mystrcpy(g_tmp,g_caption);
+
       if (this_page->id==NSIS_PAGE_CUSTOM) // custom page
       {
-        mystrcpy(g_tmp,g_caption);
         process_string_fromtab(
           g_tmp+mystrlen(g_tmp),
           this_page->caption // post_func contains the caption for custom functions
@@ -535,7 +538,6 @@ nextPage:
 #endif //NSIS_SUPPORT_CODECALLBACKS
       if (this_page->id>=0) // NSIS page
       {
-        mystrcpy(g_tmp,g_caption);
         process_string_fromtab(
           g_tmp+mystrlen(g_tmp),
           LANG_SUBCAPTION(this_page->id-(g_is_uninstaller?NSIS_PAGE_INSTFILES:0))
@@ -553,6 +555,7 @@ nextPage:
           SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
           SendMessage(m_curwnd, WM_NOTIFY_START, 0, 0);
           ShowWindow(m_curwnd,SW_SHOWNA);
+          LockWindowUpdate(0);
         }
 
         //XGE 5th September 2002 - Do *not* move the focus to the OK button if we are