diff --git a/src/Eto.Mac/Forms/DialogHandler.cs b/src/Eto.Mac/Forms/DialogHandler.cs
index 91e73f38f..89be6427e 100644
--- a/src/Eto.Mac/Forms/DialogHandler.cs
+++ b/src/Eto.Mac/Forms/DialogHandler.cs
@@ -137,7 +137,7 @@ bool ShowAttached
 					return false;
 
 				// if the owner can't become main (e.g. NSPanel), show as attached
-				return !owner.CanBecomeMainWindow;
+				return !owner.CanBecomeMainWindow && owner is not NSPanel;
 			}
 		}