X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6da411554bfe4c2a8ddfbb0616b0030ea5e813f5..76347f46fb70138ad34af07b2ab00625600931f1:/windows/winpgnt.c

diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 1c34d71c..209c7c69 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -1737,8 +1737,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    GetCursorPos(&cursorpos);
 	    PostMessage(hwnd, WM_SYSTRAY2, cursorpos.x, cursorpos.y);
 	} else if (lParam == WM_LBUTTONDBLCLK) {
-	    /* Equivalent to IDM_VIEWKEYS. */
-	    PostMessage(hwnd, WM_COMMAND, IDM_VIEWKEYS, 0);
+	    /* Run the default menu item. */
+	    UINT menuitem = GetMenuDefaultItem(systray_menu, FALSE, 0);
+	    if (menuitem != -1)
+		PostMessage(hwnd, WM_COMMAND, menuitem, 0);
 	}
 	break;
       case WM_SYSTRAY2:
@@ -2116,6 +2118,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
         AppendMenu(systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
 	initial_menuitems_count = GetMenuItemCount(session_menu);
 
+	/* Set the default menu item. */
+	SetMenuDefaultItem(systray_menu, IDM_VIEWKEYS, FALSE);
+
 	ShowWindow(main_hwnd, SW_HIDE);
 
 	/*