diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3052,7 +3052,7 @@ void QgisApp::newPrintComposer()
 
 void QgisApp::showComposerManager()
 {
-  QgsComposerManager m;
+  QgsComposerManager m( this );
   m.exec();
 }
 
@@ -5139,7 +5139,7 @@ void QgisApp::addMapLayer( QgsMapLayer *theMapLayer )
 void QgisApp::embedLayers()
 {
   //dialog to select groups/layers from other project files
-  QgsEmbedLayerDialog d;
+  QgsEmbedLayerDialog d( this );
   if ( d.exec() == QDialog::Accepted )
   {
     mMapCanvas->freeze( true );

diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -259,7 +259,7 @@ void QgsGrassBrowser::copyMap()
       typeName = "region";
     }
 
-    QgsGrassElementDialog ed;
+    QgsGrassElementDialog ed( this );
     bool ok;
     QString source;
     QString suggest;
@@ -344,7 +344,7 @@ void QgsGrassBrowser::renameMap()
       typeName = "region";
     }
 
-    QgsGrassElementDialog ed;
+    QgsGrassElementDialog ed( this );
     bool ok;
     QString newName = ed.getItem( element, tr( "New name" ),
                                   tr( "New name for layer \"%1\"" ).arg( map ), "", map, &ok );

diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -40,7 +40,7 @@ QgsGrassMapcalc::QgsGrassMapcalc(
   QgsGrassTools *tools, QgsGrassModule *module,
   QgisInterface *iface,
   QWidget * parent, Qt::WFlags f )
-    : QMainWindow( 0, Qt::Dialog )
+    : QMainWindow( iface->mainWindow(), Qt::Dialog )
     , QgsGrassMapcalcBase( )
     , QgsGrassModuleOptions( tools, module, iface )
     , mTool( -1 )
@@ -1255,7 +1255,7 @@ void QgsGrassMapcalc::load()
 {
   QgsDebugMsg( "entered." );
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::MAPCALC );
+  QgsGrassSelect *sel = new QgsGrassSelect( this, QgsGrassSelect::MAPCALC );
   if ( sel->exec() == QDialog::Rejected )
     return;
 

diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h
@@ -52,7 +52,7 @@ class QgsGrassModule: public QDialog, private  Ui::QgsGrassModuleBase
   public:
     //! Constructor
     QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisInterface *iface,
-                    QString path, QWidget * parent = 0, Qt::WFlags f = 0 );
+                    QString path, QWidget *parent, Qt::WFlags f = 0 );
 
     //! Destructor
     ~QgsGrassModule();

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -286,7 +286,7 @@ void QgsGrassPlugin::addVector()
 // QgsDebugMsg("entered.");
   QString uri;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::VECTOR );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::VECTOR );
   if ( sel->exec() )
   {
     uri = sel->gisdbase + "/" + sel->location + "/" + sel->mapset + "/" + sel->map + "/" + sel->layer;
@@ -381,7 +381,7 @@ void QgsGrassPlugin::addRaster()
 // QgsDebugMsg("entered.");
   QString uri;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::RASTER );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::RASTER );
   if ( sel->exec() )
   {
     QString element;
@@ -514,7 +514,7 @@ void QgsGrassPlugin::newVector()
   bool ok;
   QString name;
 
-  QgsGrassElementDialog dialog;
+  QgsGrassElementDialog dialog( qGisInterface->mainWindow() );
   name = dialog.getItem( "vector", tr( "New vector name" ),
                          tr( "New vector name" ), "", "", &ok );
 
@@ -704,7 +704,7 @@ void QgsGrassPlugin::openMapset()
 
   QString element;
 
-  QgsGrassSelect *sel = new QgsGrassSelect( QgsGrassSelect::MAPSET );
+  QgsGrassSelect *sel = new QgsGrassSelect( qGisInterface->mainWindow(), QgsGrassSelect::MAPSET );
 
   if ( !sel->exec() )
     return;

diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
@@ -29,7 +29,7 @@ extern "C"
 }
 
 
-QgsGrassSelect::QgsGrassSelect( int type ): QgsGrassSelectBase()
+QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ), QgsGrassSelectBase()
 {
   QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );
 

diff --git a/src/plugins/grass/qgsgrassselect.h b/src/plugins/grass/qgsgrassselect.h
@@ -28,7 +28,7 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
   public:
     //! Constructor
     //QgsGrassSelect(QWidget *parent = 0, int type = VECTOR );
-    QgsGrassSelect( int type = VECTOR );
+    QgsGrassSelect( QWidget *parent, int type = VECTOR );
     //! Destructor
     ~QgsGrassSelect();
 

diff --git a/src/plugins/grass/qgsgrassutils.cpp b/src/plugins/grass/qgsgrassutils.cpp
@@ -65,7 +65,7 @@ bool QgsGrassUtils::itemExists( QString element, QString item )
   return fi.exists();
 }
 
-QgsGrassElementDialog::QgsGrassElementDialog() : QObject()
+QgsGrassElementDialog::QgsGrassElementDialog( QWidget *parent ) : QObject(), mParent( parent )
 {
 }
 
@@ -80,7 +80,7 @@ QString QgsGrassElementDialog::getItem( QString element,
     *ok = false;
   mElement = element;
   mSource = source;
-  mDialog = new QDialog();
+  mDialog = new QDialog( mParent );
   mDialog->setWindowTitle( title );
   QVBoxLayout *layout = new QVBoxLayout( mDialog );
   QHBoxLayout *buttonLayout = new QHBoxLayout( );

diff --git a/src/plugins/grass/qgsgrassutils.h b/src/plugins/grass/qgsgrassutils.h
@@ -58,7 +58,7 @@ class QgsGrassElementDialog: public QObject
 
   public:
     //! Constructor
-    QgsGrassElementDialog();
+    QgsGrassElementDialog( QWidget *parent );
 
     //! Destructor
     ~QgsGrassElementDialog();
@@ -83,6 +83,7 @@ class QgsGrassElementDialog: public QObject
     QLabel *mErrorLabel;
     QPushButton *mOkButton;
     QPushButton *mCancelButton;
+    QWidget *mParent;
 };
 
 #endif // QGSGRASSUTILS_H
diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
@@ -20,10 +20,11 @@
 #include "qgsrasterlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgisinterface.h"
 
 #include <QSettings>
 
-QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog(), mIface( iface )
+QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog( iface->mainWindow() ), mIface( iface )
 {
   setupUi( this );
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ extern "C" @@
     }
-    QgsGrassSelect::QgsGrassSelect( int type ): QgsGrassSelectBase()
+    QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ), QgsGrassSelectBase()
     {
       QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );
@@ Expand Down @@