diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c
index 057ec4c8534..dc9482ca34f 100644
--- a/dll/cpl/joy/joy.c
+++ b/dll/cpl/joy/joy.c
@@ -270,6 +270,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     break;
 
                 case IDOK:
+                case IDCANCEL:
                     DestroyIcon(s_hIcon);
                     DestroyIcon(s_hIconSm);
                     EndDialog(hwndDlg,LOWORD(wParam));