diff --git a/src/stores/controller.ts b/src/stores/controller.ts
index 961d8ea6..2fcef3bd 100644
--- a/src/stores/controller.ts
+++ b/src/stores/controller.ts
@@ -40,6 +40,7 @@ export const useControllerStore = defineStore('controller', () => {
   const availableAxesActions = allAvailableAxes
   const availableButtonActions = allAvailableButtons
   const enableForwarding = ref(true)
+  const holdLastInputWhenWindowHidden = useStorage('cockpit-hold-last-joystick-input-when-window-hidden', false)
 
   const protocolMapping = computed<JoystickProtocolActionsMapping>({
     get() {
@@ -99,6 +100,10 @@ export const useControllerStore = defineStore('controller', () => {
   // Disable joystick forwarding if the window/tab is not visible (using VueUse)
   const windowVisibility = useDocumentVisibility()
   watch(windowVisibility, (value) => {
+    // Disable this failcheck if the user explicitly wants to hold the last input when the window is hidden
+    // This can be considered unsafe, as the user might not be aware of the joystick input being forwarded to the vehicle
+    if (holdLastInputWhenWindowHidden.value) return
+
     if (value === 'hidden') {
       console.warn('Window/tab hidden. Disabling joystick forwarding.')
       enableForwarding.value = false
@@ -320,6 +325,7 @@ export const useControllerStore = defineStore('controller', () => {
   return {
     registerControllerUpdateCallback,
     enableForwarding,
+    holdLastInputWhenWindowHidden,
     joysticks,
     protocolMapping,
     protocolMappings,
diff --git a/src/views/ConfigurationJoystickView.vue b/src/views/ConfigurationJoystickView.vue
index 14730af2..99794286 100644
--- a/src/views/ConfigurationJoystickView.vue
+++ b/src/views/ConfigurationJoystickView.vue
@@ -183,6 +183,11 @@
             </div>
           </div>
         </div>
+        <v-switch
+          v-model="controllerStore.holdLastInputWhenWindowHidden"
+          label="Hold last joystick input when window is hidden (tab changed or window minimized)"
+          class="m-2 text-slate-800"
+        />
       </div>
     </template>
   </BaseConfigurationView>