diff --git a/Ryujinx/Ryujinx.conf b/Ryujinx/Ryujinx.conf
index fef59b0dd6..1c9b79f0d6 100644
--- a/Ryujinx/Ryujinx.conf
+++ b/Ryujinx/Ryujinx.conf
@@ -23,14 +23,20 @@ Logging_Enable_Error = true
 Logging_Filtered_Classes =
 
 #Whether or not to enable Controller support
-GamePad_Enable = false
+GamePad_Enable = true
 
 #Device Mappings
 
-#Handheld Devices can not be mixed with any other players (Player 1, Player 2, etc.)
-Handheld_Device = Keyboard
+#Valid Mappings:
+#None = Disabled
+#Keyboard = Keyboard Input
+#GamePad_X = X Game Pad Configuration (eg. GamePad_0 is the zeroth Controller Configuration)
 
-Player1_Device = None
+#Handheld Devices can not be mixed with any other players (Player 1, Player 2, etc.)
+#This can stay at None unless you specifically want to emulate Handheld controllers.
+Handheld_Device = None
+
+Player1_Device = Keyboard
 Player2_Device = None
 Player3_Device = None
 Player4_Device = None