diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
index 291ea57..54ade11 100644
--- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
+++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
@@ -466,7 +466,7 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol,
     else
     {
       if (saved_mode >= 2) {
-        SetRoleSwitchFlag(MODE_F6_F7_FPS_UAC1);
+        SetRoleSwitchFlag(MODE_F5_MUSIC_UAC1);
         device_reboot();
         while (1);
       }
@@ -1865,6 +1865,14 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol,
                 }
 #endif
 
+#if UAC1_MODE == 1
+                if (host_os == OS_WIN) {
+                    unsigned flag = (saved_mode <= 1) ? MODE_F1_MUSIC_UAC2 : MODE_F3_F4_FPS_UAC2;
+                    SetRoleSwitchFlag(flag);
+                    device_reboot();
+                    while (1);
+                }
+#endif
                 break;
             }
         }