diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
index 5c81c7d4..2d37a8d0 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
@@ -307,9 +307,11 @@ class OptionPanePanel
 		}
 
 		private void showDialog() {
+			Window window = SwingUtilities.windowForComponent( this );
+
 			if( optionPane.getWantsInput() ) {
 				JOptionPane.showInputDialog(
-					getParent(),
+					window,
 					optionPane.getMessage(),
 					titleLabel.getText() + " Title",
 					optionPane.getMessageType(),
@@ -318,7 +320,7 @@ class OptionPanePanel
 					null );
 			} else {
 				JOptionPane.showOptionDialog(
-					getParent(),
+					window,
 					optionPane.getMessage(),
 					titleLabel.getText() + " Title",
 					optionPane.getOptionType(),