diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 61e34f99246..2a889223143 100644
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -257,8 +257,8 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
         /* fall through */
     case WM_LBUTTONDOWN:
         NtUserSetCapture( hWnd );
-        NtUserSetFocus( hWnd );
         set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED );
+        NtUserSetFocus( hWnd );
         SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 );
         break;
 
@@ -381,6 +381,12 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
         paint_button( hWnd, btn_type, ODA_FOCUS );
         if (style & BS_NOTIFY)
             BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS);
+
+        if (((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON)) &&
+            !(get_button_state(hWnd) & (BST_CHECKED | BUTTON_BTNPRESSED)))
+        {
+            BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED);
+        }
         break;
 
     case WM_KILLFOCUS:
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index e9218102eec..ba8307f36b1 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -20576,7 +20576,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on default radiobutton", TRUE);
+        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on default radiobutton", FALSE);
         DestroyWindow(button);
 
         /* Test already checked button */
@@ -20597,7 +20597,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on focused radiobutton", TRUE);
+        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on focused radiobutton", FALSE);
         DestroyWindow(button);
 
         /* Test WM_LBUTTONDOWN */
@@ -20616,7 +20616,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_without_notify_seq, "WM_SETFOCUS on radiobutton withouth BS_NOTIFY", TRUE);
+        ok_sequence(set_focus_without_notify_seq, "WM_SETFOCUS on radiobutton withouth BS_NOTIFY", FALSE);
         DestroyWindow(button);
     }