diff --git a/Assets/dll/puae.wbx.zst b/Assets/dll/puae.wbx.zst
index e54f3fcb451..86c26ad01e4 100644
Binary files a/Assets/dll/puae.wbx.zst and b/Assets/dll/puae.wbx.zst differ
diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs
index cf77dc74d83..960ba528c91 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.ISettable.cs
@@ -328,13 +328,13 @@ public class PUAESyncSettings
 
 			[DisplayName("Controller port 1")]
 			[Description("")]
-			[DefaultValue(LibPUAE.ControllerType.Joystick)]
+			[DefaultValue(LibPUAE.ControllerType.Mouse)]
 			[TypeConverter(typeof(DescribableEnumConverter))]
 			public LibPUAE.ControllerType ControllerPort1 { get; set; }
 
 			[DisplayName("Controller port 2")]
 			[Description("")]
-			[DefaultValue(LibPUAE.ControllerType.Mouse)]
+			[DefaultValue(LibPUAE.ControllerType.Joystick)]
 			[TypeConverter(typeof(DescribableEnumConverter))]
 			public LibPUAE.ControllerType ControllerPort2 { get; set; }
 
diff --git a/waterbox/uae/bizhawk.c b/waterbox/uae/bizhawk.c
index 10be5df39c1..04e0030ee5f 100644
--- a/waterbox/uae/bizhawk.c
+++ b/waterbox/uae/bizhawk.c
@@ -45,11 +45,6 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 		Controller *controller = (port == 0) ? &f->Port1 : &f->Port2;
 		cd32_pad_enabled[port] = 0;
 
-		// shared between mouse and joystick
-		setjoybuttonstate(port, JOYBUTTON_1, controller->Buttons.b1);
-		setjoybuttonstate(port, JOYBUTTON_2, controller->Buttons.b2);
-		setjoybuttonstate(port, JOYBUTTON_3, controller->Buttons.b3);
-
 		switch (controller->Type)
 		{
 			case CONTROLLER_JOYSTICK:
@@ -57,6 +52,9 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 														controller->Buttons.down  ? JOY_MAX : JOY_MID, 1);
 				setjoystickstate(port, AXIS_HORIZONTAL, controller->Buttons.left  ? JOY_MIN :
 														controller->Buttons.right ? JOY_MAX : JOY_MID, 1);
+				setjoybuttonstate(port, JOYBUTTON_1, controller->Buttons.b1);
+				setjoybuttonstate(port, JOYBUTTON_2, controller->Buttons.b2);
+				setjoybuttonstate(port, JOYBUTTON_3, controller->Buttons.b3);
 				break;
 			case CONTROLLER_CD32PAD:
 				cd32_pad_enabled[port] = 1;
@@ -71,6 +69,9 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 			case CONTROLLER_MOUSE:
 				setmousestate(port, AXIS_HORIZONTAL, controller->MouseX - last_mouse_x[port], MOUSE_RELATIVE);
 				setmousestate(port, AXIS_VERTICAL,   controller->MouseY - last_mouse_y[port], MOUSE_RELATIVE);
+				setmousebuttonstate(port, MOUSE_LEFT,   controller->Buttons.b1);
+				setmousebuttonstate(port, MOUSE_RIGHT,  controller->Buttons.b2);
+				setmousebuttonstate(port, MOUSE_MIDDLE, controller->Buttons.b3);
 				break;
 		}
 	}