diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 4aebfb1b51..d78cc04595 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1705,6 +1705,13 @@ void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind)
             break;
     }
 
+    if ( m_modalityKind != wxPreviewFrame_NonModal )
+    {
+        // Behave like modal dialogs, don't show in taskbar. This implies
+        // removing the minimize box, because minimizing windows without
+        // taskbar entry is confusing.
+        SetWindowStyle(GetWindowStyle() & ~wxMINIMIZE_BOX | wxFRAME_NO_TASKBAR);
+    }
 
     Layout();