diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
index f7d23e30876..62d12870ed2 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
@@ -34,6 +34,8 @@
 #ifndef _AIX
 #include "screencast_pipewire.h"
 #include "fp_pipewire.h"
+#include "java_awt_event_KeyEvent.h"
+
 #include <stdio.h>
 
 #include "gtk_interface.h"
@@ -1142,6 +1144,24 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMou
     return result ? RESULT_OK : pw.pwFd;
 }
 
+static int getNumpadKey(jint jkey) {
+    switch (jkey) {
+        case java_awt_event_KeyEvent_VK_NUMPAD0: return XK_KP_Insert;
+        case java_awt_event_KeyEvent_VK_NUMPAD1: return XK_KP_End;
+        case java_awt_event_KeyEvent_VK_NUMPAD2: return XK_KP_Down;
+        case java_awt_event_KeyEvent_VK_NUMPAD3: return XK_KP_Page_Down;
+        case java_awt_event_KeyEvent_VK_NUMPAD4: return XK_KP_Left;
+        case java_awt_event_KeyEvent_VK_NUMPAD5: return XK_KP_Begin;
+        case java_awt_event_KeyEvent_VK_NUMPAD6: return XK_KP_Right;
+        case java_awt_event_KeyEvent_VK_NUMPAD7: return XK_KP_Home;
+        case java_awt_event_KeyEvent_VK_NUMPAD8: return XK_KP_Up;
+        case java_awt_event_KeyEvent_VK_NUMPAD9: return XK_KP_Prior;
+        case java_awt_event_KeyEvent_VK_DECIMAL:
+        case java_awt_event_KeyEvent_VK_SEPARATOR: return XK_KP_Delete;
+        default: return 0;
+    }
+}
+
 /*
  * Class:     sun_awt_screencast_ScreencastHelper
  * Method:    remoteDesktopKeyImpl
@@ -1150,9 +1170,12 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMou
 JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopKeyImpl
         (JNIEnv *env, jclass cls, jboolean isPress, jint jkey, jstring jtoken) {
 
-    AWT_LOCK();
-    int key = awt_getX11KeySym(jkey);
-    AWT_UNLOCK();
+    int key = getNumpadKey(jkey);
+    if (!key) {
+        AWT_LOCK();
+        key = awt_getX11KeySym(jkey);
+        AWT_UNLOCK();
+    }
 
     if (key == NoSymbol || (*env)->ExceptionCheck(env)) {
         return RESULT_ERROR;
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyCharTest/KeyCharTest.java b/test/jdk/java/awt/event/KeyEvent/KeyCharTest/KeyCharTest.java
index 83b6e7735ea..819c041308c 100644
--- a/test/jdk/java/awt/event/KeyEvent/KeyCharTest/KeyCharTest.java
+++ b/test/jdk/java/awt/event/KeyEvent/KeyCharTest/KeyCharTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
   @test
-  @bug 5013984
+  @bug 5013984 8360647
   @summary Tests KEY_PRESSED has the same KeyChar as KEY_RELEASED
   @key headful
   @run main KeyCharTest
@@ -37,7 +37,7 @@
 import java.util.HashMap;
 
 public class KeyCharTest extends Frame implements KeyListener {
-    HashMap<Integer, Character> transMap = new HashMap();
+    HashMap<Integer, Character> transMap = new HashMap<>();
 
     public void keyTyped(KeyEvent e){
     }
@@ -47,22 +47,35 @@ public void keyPressed(KeyEvent e){
     }
 
     public void keyReleased(KeyEvent e){
-        Object value = transMap.get(e.getKeyCode());
-        if (value != null && e.getKeyChar() != ((Character)value).charValue()) {
+        Character value = transMap.get(e.getKeyCode());
+        if (value != null && e.getKeyChar() != value) {
             throw new RuntimeException("Wrong KeyChar on KEY_RELEASED "+
                 KeyEvent.getKeyText(e.getKeyCode()));
         }
     }
 
-    public void start () {
+    private void testKeyRange(Robot robot, int start, int end) {
+        System.out.printf("\nTesting range on %d to %d\n", start, end);
+        for(int vkey = start; vkey <= end; vkey++) {
+            try {
+                robot.keyPress(vkey);
+                robot.keyRelease(vkey);
+                System.out.println(KeyEvent.getKeyText(vkey) + " " + vkey);
+            } catch (RuntimeException ignored) {}
+        }
+        robot.delay(100);
+    }
+
+    public void start() throws Exception {
+        Robot robot = new Robot();
         addKeyListener(this);
         setLocationRelativeTo(null);
         setSize(200, 200);
         setVisible(true);
         requestFocus();
 
+        boolean wasNumlockPressed = false;
         try {
-            Robot robot = new Robot();
             robot.setAutoDelay(10);
             robot.setAutoWaitForIdle(true);
             robot.delay(100);
@@ -72,22 +85,25 @@ public void start () {
             robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
             robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
 
-            for(int vkey = 0x20; vkey < 0x7F; vkey++) {
-                try {
-                    robot.keyPress(vkey);
-                    robot.keyRelease(vkey);
-                    System.out.println(KeyEvent.getKeyText(vkey) + " " + vkey);
-                } catch (RuntimeException e) {
-                }
-            }
-            robot.delay(100);
+            testKeyRange(robot, 0x20, 0x7E);
+
+            // Try again with a different numpad state.
+            robot.keyPress(KeyEvent.VK_NUM_LOCK);
+            robot.keyRelease(KeyEvent.VK_NUM_LOCK);
+            wasNumlockPressed = true;
+
+            testKeyRange(robot, KeyEvent.VK_NUMPAD0, KeyEvent.VK_DIVIDE);
         } catch(Exception e){
-            e.printStackTrace();
             throw new RuntimeException("Exception while performing Robot actions.");
+        } finally {
+            if (wasNumlockPressed) {
+                robot.keyPress(KeyEvent.VK_NUM_LOCK);
+                robot.keyRelease(KeyEvent.VK_NUM_LOCK);
+            }
         }
    }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         KeyCharTest test = new KeyCharTest();
         try {
             test.start();