diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
index ba1927bb948..ad6b226dd70 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -25,7 +25,9 @@
 package javax.swing.plaf.synth;
 
 import sun.swing.DefaultLookup;
+
 import javax.swing.JComponent;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 /**
@@ -35,6 +37,12 @@ import javax.swing.plaf.ComponentUI;
  */
 class SynthDefaultLookup extends DefaultLookup {
     public Object getDefault(JComponent c, ComponentUI ui, String key) {
+        if (ui instanceof SynthOptionPaneUI) {
+            Object value = super.getDefault(c, ui, key);
+            if (value != null) {
+                return value;
+            }
+        }
         if (!(ui instanceof SynthUI)) {
             Object value = super.getDefault(c, ui, key);
             return value;
diff --git a/test/jdk/javax/swing/JOptionPane/bug4174551.java b/test/jdk/javax/swing/JOptionPane/bug4174551.java
index f65f95192b7..dbe6cdffe1a 100644
--- a/test/jdk/javax/swing/JOptionPane/bug4174551.java
+++ b/test/jdk/javax/swing/JOptionPane/bug4174551.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4174551
+ * @bug 4174551 8346260
  * @summary JOptionPane should allow custom buttons
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame