diff --git a/app/src/main/java/emu/skyline/preference/ControllerPreference.kt b/app/src/main/java/emu/skyline/preference/ControllerPreference.kt
index 710761aa..d81be85d 100644
--- a/app/src/main/java/emu/skyline/preference/ControllerPreference.kt
+++ b/app/src/main/java/emu/skyline/preference/ControllerPreference.kt
@@ -25,6 +25,10 @@ class ControllerPreference @JvmOverloads constructor(context : Context, attrs :
         notifyChanged()
     }
 
+    companion object {
+        const val INDEX_ARG = "index"
+    }
+
     /**
      * The index of the controller this preference manages
      */
@@ -36,7 +40,7 @@ class ControllerPreference @JvmOverloads constructor(context : Context, attrs :
         for (i in 0 until attrs!!.attributeCount) {
             val attr = attrs.getAttributeName(i)
 
-            if (attr.equals("index", ignoreCase = true)) {
+            if (attr.equals(INDEX_ARG)) {
                 index = attrs.getAttributeValue(i).toInt()
                 break
             }
@@ -55,5 +59,5 @@ class ControllerPreference @JvmOverloads constructor(context : Context, attrs :
     /**
      * This launches [ControllerActivity] on click to configure the controller
      */
-    override fun onClick() = controllerCallback.launch(Intent(context, ControllerActivity::class.java))
+    override fun onClick() = controllerCallback.launch(Intent(context, ControllerActivity::class.java).putExtra(INDEX_ARG, index))
 }
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0b5be5c4..6b905773 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -28,4 +28,8 @@
         <!-- A URL to the library -->
         <attr format="string" name="libraryUrl"/>
     </declare-styleable>
+    <declare-styleable name="ControllerPreference">
+        <!-- Index of the controller the preference corresponds to -->
+        <attr name="index" format="integer" />
+    </declare-styleable>
 </resources>