diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index dd24269a71..979d7cc9e6 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -71,7 +71,13 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
                                      long style,
                                      const wxPoint& pos)
 {
-    if ( !wxDialog::Create(GetParentForModalDialog(parent, style),
+    // Do not pass style to GetParentForModalDialog() as wxDIALOG_NO_PARENT
+    // has the same numeric value as wxTE_MULTILINE and so attempting to create
+    // a dialog for editing multiline text would also prevent it from having a
+    // parent which is undesirable. As it is, we can't create a text entry
+    // dialog without a parent which is not ideal neither but is a much less
+    // important problem.
+    if ( !wxDialog::Create(GetParentForModalDialog(parent, 0),
                            wxID_ANY, caption,
                            pos, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) )