diff --git a/CHANGES b/CHANGES
index 1d450bbe9..ddb5d748c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ Misc:
  - GBA: Slightly optimize GBAProcessEvents
  - Qt: Add preset for DualShock 4
  - SDL: Remove default gamepad mappings
+ - Qt: Update 360 input profile on OS X to reflect newer drivers
 
 0.4.0: (2016-02-02)
 Features:
diff --git a/src/platform/qt/InputProfile.cpp b/src/platform/qt/InputProfile.cpp
index 1182d640a..d27bfae7d 100644
--- a/src/platform/qt/InputProfile.cpp
+++ b/src/platform/qt/InputProfile.cpp
@@ -63,29 +63,7 @@ const InputProfile InputProfile::s_defaultMaps[] = {
 		}
 	},
 	{
-		"(Sony Computer Entertainment )?Wireless Controller", // The DualShock 4 device ID is cut off on Windows
-		(int[GBA_KEY_MAX]) {
-		/*keyA      */  1,
-		/*keyB      */  2,
-		/*keySelect */  8,
-		/*keyStart  */  9,
-		/*keyRight  */ -1,
-		/*keyLeft   */ -1,
-		/*keyUp     */ -1,
-		/*keyDown   */ -1,
-		/*keyR      */  5,
-		/*keyL      */  4
-		},
-		(ShortcutButton[]) {
-			{"loadState", 0},
-			{"saveState", 3},
-			{"holdFastForward", 7},
-			{"holdRewind", 6},
-			{}
-		},
-	},
-	{
-		"Controller", // The Xbox 360 controller drivers on OS X are vague...
+		"Xbox 360 Wired Controller", // OS X
 		(int[GBA_KEY_MAX]) {
 		/*keyA      */  1,
 		/*keyB      */  0,
@@ -109,6 +87,28 @@ const InputProfile InputProfile::s_defaultMaps[] = {
 			{}
 		}
 	},
+	{
+		"(Sony Computer Entertainment )?Wireless Controller", // The DualShock 4 device ID is cut off on Windows
+		(int[GBA_KEY_MAX]) {
+		/*keyA      */  1,
+		/*keyB      */  2,
+		/*keySelect */  8,
+		/*keyStart  */  9,
+		/*keyRight  */ -1,
+		/*keyLeft   */ -1,
+		/*keyUp     */ -1,
+		/*keyDown   */ -1,
+		/*keyR      */  5,
+		/*keyL      */  4
+		},
+		(ShortcutButton[]) {
+			{"loadState", 0},
+			{"saveState", 3},
+			{"holdFastForward", 7},
+			{"holdRewind", 6},
+			{}
+		},
+	},
 	{
 		"PLAYSTATION\\(R\\)3 Controller", // DualShock 3 (OS X)
 		(int[GBA_KEY_MAX]) {