diff --git a/src/GoodWood.Web/Components/Game/Pin.razor b/src/GoodWood.Web/Components/Game/Pin.razor
index c3fd234..ed01f12 100644
--- a/src/GoodWood.Web/Components/Game/Pin.razor
+++ b/src/GoodWood.Web/Components/Game/Pin.razor
@@ -1,7 +1,7 @@
 @using GoodWood.Domain.Enums
 
 <div class="pin @GetPinClass()" @onclick="OnClick" style="@GetStyle()">
-    <span class="pin-number">@(ThrowMode == ThrowMode.Decrease ? "" : PinNumber)</span>
+    <span class="pin-number">@(ThrowMode == ThrowMode.Reposition ? "" : PinNumber)</span>
 </div>
 
 <style>
diff --git a/src/GoodWood.Web/Components/Game/PinPanel.razor b/src/GoodWood.Web/Components/Game/PinPanel.razor
index 80f7341..627fc91 100644
--- a/src/GoodWood.Web/Components/Game/PinPanel.razor
+++ b/src/GoodWood.Web/Components/Game/PinPanel.razor
@@ -1,5 +1,8 @@
 @using GoodWood.Domain.Enums
 @using GoodWood.Web.Store.GameState
+@using Microsoft.JSInterop
+@inject IJSRuntime JS
+@implements IAsyncDisposable
 
 <div class="pin-panel">
     @* Row 1: Pin 1 (top) *@
@@ -128,6 +131,42 @@
         _ => PinStatus.Standing
     };
 
+    private DotNetObjectReference<PinPanel>? _dotNetRef;
+    private IJSObjectReference? _jsModule;
+    private IJSObjectReference? _keyListener;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _dotNetRef = DotNetObjectReference.Create(this);
+            _jsModule = await JS.InvokeAsync<IJSObjectReference>("import", "/js/numberPanel.js");
+            _keyListener = await _jsModule.InvokeAsync<IJSObjectReference>("registerKeyListener", _dotNetRef);
+        }
+    }
+
+    [JSInvokable]
+    public async Task HandleKeyPress(int number)
+    {
+        if (!IsInteractive || ThrowMode != ThrowMode.Decrease)
+            return;
+
+        if (number >= 1 && number <= 9)
+            await OnPinClicked.InvokeAsync(number);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (_keyListener is not null)
+        {
+            await _keyListener.InvokeVoidAsync("dispose");
+            await _keyListener.DisposeAsync();
+        }
+        if (_jsModule is not null)
+            await _jsModule.DisposeAsync();
+        _dotNetRef?.Dispose();
+    }
+
     private async Task HandlePinClick(int pinNumber)
     {
         await OnPinClicked.InvokeAsync(pinNumber);