diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index cea678d0..9bd228e2 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -9,6 +9,7 @@ import ProtocolList from "@/components/protocol/ProtocolList.vue";
 import {useQuasar} from "quasar";
 import {useUiStateStore} from "@/store/uiState";
 import {useProtocolStore} from "@/store/protocolState";
+import GamepadStatus from "@/components/GamepadStatus.vue";
 
 const uiStore = useUiStateStore()
 const protocolStore = useProtocolStore()
@@ -89,6 +90,7 @@ const dev = computed(() => {
         <q-toggle dense flat round class="q-mx-sm" @click="toggleShortcuts" :model-value="showShortcuts" color="black">
           Show Shortcuts
         </q-toggle>
+        <GamepadStatus class="q-mx-xs"/>
         <StatusMessageButton/>
         <q-btn dense flat round icon="menu" @click="toggleRightDrawer"/>
       </q-toolbar>
diff --git a/frontend/src/components/GamepadStatus.vue b/frontend/src/components/GamepadStatus.vue
new file mode 100644
index 00000000..7b11334f
--- /dev/null
+++ b/frontend/src/components/GamepadStatus.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import {computed, inject} from 'vue'
+import type {GamepadController} from "@/providers/gamepadController";
+import {GAMEPAD_BUTTON_ACTIONS, GAMEPAD_BUTTON_LABELS} from "@/providers/gamepadController";
+
+const gamepadController = inject<GamepadController>('gamepad-controller')!
+
+const connected = computed(() => gamepadController.state.connected)
+const gamepadId = computed(() => {
+  // Shorten the raw gamepad id for display
+  const id = gamepadController.state.gamepadId
+  if (!id) return ''
+  // Try to extract a human-friendly name from strings like:
+  // "DualSense Wireless Controller (STANDARD GAMEPAD Vendor: 054c Product: 0ce6)"
+  const parenIdx = id.indexOf('(')
+  return parenIdx > 0 ? id.slice(0, parenIdx).trim() : id
+})
+
+const activeButton = computed(() => gamepadController.state.activeButton)
+const activeButtonLabel = computed(() => {
+  const b = activeButton.value
+  if (b === null) return null
+  return GAMEPAD_BUTTON_LABELS[b] ?? `Button ${b}`
+})
+const activeActionLabel = computed(() => {
+  const b = activeButton.value
+  if (b === null) return null
+  return GAMEPAD_BUTTON_ACTIONS[b] ?? null
+})
+
+// Gamepad reference button layout for the tooltip
+const buttonMap = Object.entries(GAMEPAD_BUTTON_LABELS)
+  .filter(([idx]) => GAMEPAD_BUTTON_ACTIONS[Number(idx)] !== undefined)
+  .map(([idx, label]) => ({
+    button: label,
+    action: GAMEPAD_BUTTON_ACTIONS[Number(idx)],
+  }))
+</script>
+
+<template>
+  <!-- Gamepad icon shown in the toolbar -->
+  <q-btn
+    dense flat round
+    :icon="connected ? 'sports_esports' : 'videogame_asset_off'"
+    :color="connected ? 'white' : 'grey-5'"
+  >
+    <!-- Active button flash badge -->
+    <q-badge v-if="activeButton !== null" floating color="amber" text-color="black">
+      {{ activeButtonLabel }}
+    </q-badge>
+
+    <!-- Clickable menu with full button map (stays open until click outside) -->
+    <q-menu anchor="bottom right" self="top right" :offset="[0, 8]" max-width="360px" class="bg-dark text-white q-pa-sm">
+      <div class="text-subtitle2 q-mb-xs">
+        <q-icon name="sports_esports" class="q-mr-xs"/>
+        Gamepad Controls
+      </div>
+
+      <div v-if="!connected" class="text-caption text-grey-4">
+        Connect a PS5 DualSense or compatible gamepad to use physical controls.
+      </div>
+
+      <template v-else>
+        <div class="text-caption text-grey-3 q-mb-sm">{{ gamepadId }}</div>
+
+        <q-markup-table dense flat dark class="gamepad-table">
+          <thead>
+          <tr>
+            <th class="text-left">Button</th>
+            <th class="text-left">Action</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr
+            v-for="entry in buttonMap"
+            :key="entry.button"
+            :class="{'text-amber': activeButtonLabel === entry.button}"
+          >
+            <td>
+              <q-chip dense size="sm" color="grey-8" text-color="white">{{ entry.button }}</q-chip>
+            </td>
+            <td class="text-caption">{{ entry.action }}</td>
+          </tr>
+          </tbody>
+        </q-markup-table>
+      </template>
+    </q-menu>
+  </q-btn>
+
+  <!-- Live action indicator when a button is pressed -->
+  <transition name="fade">
+    <q-chip
+      v-if="activeButton !== null && activeActionLabel"
+      dense
+      color="amber"
+      text-color="black"
+      icon="sports_esports"
+      class="q-mx-xs"
+    >
+      {{ activeActionLabel }}
+    </q-chip>
+  </transition>
+</template>
+
+<style scoped>
+.gamepad-table {
+  min-width: 280px;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.15s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+</style>
diff --git a/frontend/src/plugins/control/index.ts b/frontend/src/plugins/control/index.ts
index 718a9637..5b2fb927 100644
--- a/frontend/src/plugins/control/index.ts
+++ b/frontend/src/plugins/control/index.ts
@@ -6,15 +6,18 @@ import type {App} from "vue";
 import {useProtocolStore} from "@/store/protocolState";
 import {ManualActions} from "@/providers/manualActions";
 import {Shortcuts} from "@/providers/shortcuts";
+import {GamepadController} from "@/providers/gamepadController";
 
 export const control = {
   install(app: App) {
     const controlApi = new ControlApi()
     const manualActions = new ManualActions(controlApi)
     const shortcuts = new Shortcuts(manualActions, controlApi)
+    const gamepadController = new GamepadController(manualActions, controlApi)
     app.provide('control-api', controlApi)
     app.provide('command-actions', manualActions)
     app.provide('shortcuts', shortcuts)
+    app.provide('gamepad-controller', gamepadController)
 
     const matchStateStore = useMatchStateStore()
     controlApi.RegisterConsumer((output: OutputJson) => {
diff --git a/frontend/src/providers/gamepadController/index.ts b/frontend/src/providers/gamepadController/index.ts
new file mode 100644
index 00000000..4ceef1c9
--- /dev/null
+++ b/frontend/src/providers/gamepadController/index.ts
@@ -0,0 +1,237 @@
+import {reactive} from 'vue'
+import type {ManualActions} from "@/providers/manualActions";
+import type {ControlApi} from "@/providers/controlApi";
+import {useGcStateStore} from "@/store/gcState";
+
+// Standard PS5 DualSense / generic gamepad button labels
+export const GAMEPAD_BUTTON_LABELS: Record<number, string> = {
+  0: 'Cross (×)',
+  1: 'Circle (○)',
+  2: 'Square (□)',
+  3: 'Triangle (△)',
+  4: 'L1',
+  5: 'R1',
+  6: 'L2',
+  7: 'R2',
+  8: 'Create',
+  9: 'Options',
+  10: 'L3',
+  11: 'R3',
+  12: 'D-Pad ↑',
+  13: 'D-Pad ↓',
+  14: 'D-Pad ←',
+  15: 'D-Pad →',
+  16: 'PS',
+  17: 'Touchpad',
+}
+
+// What action each button triggers (for display in the UI)
+export const GAMEPAD_BUTTON_ACTIONS: Record<number, string> = {
+  0: 'STOP',
+  1: 'HALT',
+  2: 'Force Start',
+  3: 'Normal Start',
+  4: 'Kick-off Yellow',
+  5: 'Kick-off Blue',
+  6: 'Direct Yellow',
+  7: 'Direct Blue',
+  8: 'Toggle Auto-Continue',
+  9: 'Continue (action 1)',
+  10: 'Timeout Yellow',
+  11: 'Timeout Blue',
+  12: 'Continue (action 2)',
+  13: 'Continue (action 3)',
+  14: 'Continue (action 4)',
+  15: 'Continue (action 5)',
+}
+
+export interface GamepadControllerState {
+  connected: boolean
+  gamepadId: string
+  activeButton: number | null
+}
+
+export class GamepadController {
+  private readonly manualActions: ManualActions
+  private readonly controlApi: ControlApi
+  private readonly gcStateStore = useGcStateStore()
+  private enabled: boolean = true
+  private animationFrameId: number | null = null
+  private previousButtonStates: boolean[] = []
+  private currentGamepadIndex: number | null = null
+
+  public readonly state = reactive<GamepadControllerState>({
+    connected: false,
+    gamepadId: '',
+    activeButton: null,
+  })
+
+  constructor(manualActions: ManualActions, controlApi: ControlApi) {
+    this.manualActions = manualActions
+    this.controlApi = controlApi
+    this.init()
+  }
+
+  public enable() {
+    this.enabled = true
+  }
+
+  public disable() {
+    this.enabled = false
+  }
+
+  public destroy() {
+    this.stopPolling()
+  }
+
+  private init() {
+    window.addEventListener('gamepadconnected', (e: GamepadEvent) => {
+      this.onGamepadConnected(e.gamepad)
+    })
+    window.addEventListener('gamepaddisconnected', (e: GamepadEvent) => {
+      this.onGamepadDisconnected(e.gamepad)
+    })
+    // Chrome requires user interaction before dispatching gamepadconnected.
+    // Poll once at startup to detect gamepads already plugged in.
+    this.checkExistingGamepads()
+  }
+
+  private checkExistingGamepads() {
+    const gamepads = navigator.getGamepads()
+    for (const gamepad of gamepads) {
+      if (gamepad) {
+        this.onGamepadConnected(gamepad)
+        break
+      }
+    }
+  }
+
+  private onGamepadConnected(gamepad: Gamepad) {
+    this.currentGamepadIndex = gamepad.index
+    this.state.connected = true
+    this.state.gamepadId = gamepad.id
+    this.previousButtonStates = new Array(gamepad.buttons.length).fill(false)
+    this.startPolling()
+  }
+
+  private onGamepadDisconnected(gamepad: Gamepad) {
+    if (gamepad.index === this.currentGamepadIndex) {
+      this.currentGamepadIndex = null
+      this.state.connected = false
+      this.state.gamepadId = ''
+      this.state.activeButton = null
+      this.stopPolling()
+    }
+  }
+
+  private startPolling() {
+    if (this.animationFrameId !== null) return
+    const poll = () => {
+      this.pollGamepad()
+      this.animationFrameId = requestAnimationFrame(poll)
+    }
+    this.animationFrameId = requestAnimationFrame(poll)
+  }
+
+  private stopPolling() {
+    if (this.animationFrameId !== null) {
+      cancelAnimationFrame(this.animationFrameId)
+      this.animationFrameId = null
+    }
+  }
+
+  private pollGamepad() {
+    if (this.currentGamepadIndex === null) return
+    const gamepads = navigator.getGamepads()
+    const gamepad = gamepads[this.currentGamepadIndex]
+    if (!gamepad) return
+
+    gamepad.buttons.forEach((button, index) => {
+      const wasPressed = this.previousButtonStates[index] ?? false
+      const isPressed = button.pressed
+
+      if (isPressed && !wasPressed) {
+        // Rising edge — button just pressed
+        this.state.activeButton = index
+        if (this.enabled) {
+          this.handleButtonPress(index)
+        }
+      } else if (!isPressed && wasPressed) {
+        if (this.state.activeButton === index) {
+          this.state.activeButton = null
+        }
+      }
+
+      this.previousButtonStates[index] = isPressed
+    })
+  }
+
+  private handleButtonPress(buttonIndex: number) {
+    switch (buttonIndex) {
+      // Face buttons
+      case 0: // Cross (×) → STOP
+        this.manualActions.getCommandAction('STOP').send()
+        break
+      case 1: // Circle (○) → HALT
+        this.manualActions.getCommandAction('HALT').send()
+        break
+      case 2: // Square (□) → Force Start
+        this.manualActions.getCommandAction('FORCE_START').send()
+        break
+      case 3: // Triangle (△) → Normal Start
+        this.manualActions.getCommandAction('NORMAL_START').send()
+        break
+
+      // Shoulder buttons
+      case 4: // L1 → Kick-off Yellow
+        this.manualActions.getCommandAction('KICKOFF', 'YELLOW').send()
+        break
+      case 5: // R1 → Kick-off Blue
+        this.manualActions.getCommandAction('KICKOFF', 'BLUE').send()
+        break
+      case 6: // L2 → Direct Free Kick Yellow
+        this.manualActions.getCommandAction('DIRECT', 'YELLOW').send()
+        break
+      case 7: // R2 → Direct Free Kick Blue
+        this.manualActions.getCommandAction('DIRECT', 'BLUE').send()
+        break
+
+      // Center buttons
+      case 8: // Create/Share → Toggle Auto-Continue
+        this.controlApi.ChangeConfig({autoContinue: !this.gcStateStore.config.autoContinue})
+        break
+      case 9: // Options → Continue with first available action
+        this.continueWithAction(0)
+        break
+
+      // Stick clicks
+      case 10: // L3 → Timeout Yellow
+        this.manualActions.getCommandAction('TIMEOUT', 'YELLOW').send()
+        break
+      case 11: // R3 → Timeout Blue
+        this.manualActions.getCommandAction('TIMEOUT', 'BLUE').send()
+        break
+
+      // D-Pad → cycle through continue actions
+      case 12: // D-Pad Up → Continue action 2
+        this.continueWithAction(1)
+        break
+      case 13: // D-Pad Down → Continue action 3
+        this.continueWithAction(2)
+        break
+      case 14: // D-Pad Left → Continue action 4
+        this.continueWithAction(3)
+        break
+      case 15: // D-Pad Right → Continue action 5
+        this.continueWithAction(4)
+        break
+    }
+  }
+
+  private continueWithAction(id: number) {
+    const actions = this.gcStateStore.gcState.continueActions
+    if (actions && actions.length > id) {
+      this.controlApi.Continue(actions[id])
+    }
+  }
+}