diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
index 81348327294..fbf5d27543e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, 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
@@ -1233,10 +1233,12 @@ final class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClie
      */
     @Override
     public void select(int index) {
-        // Programmatic select() should also set the focus index
-        setFocusIndex(index);
-        repaint(PAINT_FOCUS);
-        selectItem(index);
+        if (index >= 0 && index < items.size()) {
+            // Programmatic select() should also set the focus index
+            setFocusIndex(index);
+            repaint(PAINT_FOCUS);
+            selectItem(index);
+        }
     }
 
     /**
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index b39a0d093d8..42999f9e167 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -151,7 +151,6 @@ java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all
 java/awt/List/KeyEventsTest/KeyEventsTest.java 8201307 linux-all
 java/awt/List/NoEvents/ProgrammaticChange.java 8201307 linux-all
-java/awt/List/ListSelection/SelectInvalidTest.java 8369455 linux-all
 java/awt/Paint/ListRepaint.java 8201307 linux-all
 java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all
 java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java 6986109 windows-all
diff --git a/test/jdk/java/awt/List/ListSelection/SelectInvalidTest.java b/test/jdk/java/awt/List/ListSelection/SelectInvalidTest.java
index ac29b270c81..24759985725 100644
--- a/test/jdk/java/awt/List/ListSelection/SelectInvalidTest.java
+++ b/test/jdk/java/awt/List/ListSelection/SelectInvalidTest.java
@@ -32,7 +32,7 @@ import static jdk.test.lib.Asserts.assertTrue;
 
 /**
  * @test
- * @bug 8369327
+ * @bug 8369327 8369455
  * @summary Test awt list selection of invalid indexes
  * @key headful
  * @library /test/lib