diff --git a/src/views/ConfigurationJoystickView.vue b/src/views/ConfigurationJoystickView.vue
index 1324b2634..91be9d09e 100644
--- a/src/views/ConfigurationJoystickView.vue
+++ b/src/views/ConfigurationJoystickView.vue
@@ -206,6 +206,14 @@ onUnmounted(() => {
   controllerStore.enableForwarding = true
 })
 
+const currentJoystick = ref<Joystick>()
+const currentInputs = ref()
+const remappingInput = ref(false)
+const justRemappedInput = ref<boolean>()
+const inputClickedDialog = ref(false)
+
+watch(inputClickedDialog, () => (justRemappedInput.value = undefined))
+
 const availableButtons = computed(() => {
   const actualButtons = controllerStore.availableButtons.map((btn) => {
     const prettyBtn = controllerStore.allPrettyButtonNames.find(
@@ -230,11 +238,6 @@ const setCurrentInputs = (joystick: Joystick, inputs: JoystickInput[]): void =>
   currentInputs.value = inputs
   inputClickedDialog.value = true
 }
-const currentJoystick = ref<Joystick>()
-const currentInputs = ref()
-const remappingInput = ref(false)
-const justRemappedInput = ref<boolean>()
-const inputClickedDialog = ref(false)
 
 /**
  * Remaps the input of a given joystick. The function waits for a button press on the joystick and then
@@ -273,8 +276,6 @@ const remapInput = async (joystick: Joystick, input: JoystickInput): Promise<voi
   justRemappedInput.value = false
 }
 
-watch(inputClickedDialog, () => (justRemappedInput.value = undefined))
-
 /**
  * Updates which physical button or axis in the joystick maps to it's correspondent virtual input.
  * @param {number} index - The index of the input mapping to update.