diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index c19f0d65..159a1de2 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -757,16 +757,16 @@ int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam)
       {
         PAINTSTRUCT ps;
         HFONT hOldFont;
-        HFONT hFont = (HFONT)SendMessage(hWin, WM_GETFONT, 0, 0);
         HDC pDC = BeginPaint(hWin, &ps);
+        HFONT hFont = (HFONT)SendMessage(hMainWindow, WM_GETFONT, 0, 0);
         int OldMode = SetBkMode(pDC, TRANSPARENT);
         int OldTextColor;
-        
+
         if ( GetSysColorBrush(COLOR_HOTLIGHT) )
           OldTextColor = SetTextColor(pDC, GetSysColor(COLOR_HOTLIGHT));
         else
           OldTextColor = SetTextColor(pDC, RGB(0,0,255)); // Win95/NT4 arrggg!!!
-        
+
         hOldFont = (HFONT)SelectObject(pDC, hFont);        
         GetClientRect(hWin, &pFields[StaticField].rect);
 
@@ -814,7 +814,7 @@ int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam)
         
         if ( PtInRect(&pFields[StaticField].rect, pt) )
         {
-          ShellExecute(hWin, "", pFields[StaticField].pszState, "", "", SW_SHOWDEFAULT);	
+          ShellExecute(hMainWindow, NULL, pFields[StaticField].pszState, NULL, NULL, SW_SHOWDEFAULT);	
         }	
         return 0;
       }
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 02524623..f3007732 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ