diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index 6739c05a3..b2d9d0912 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -332,7 +332,8 @@ void EditProfileDialog::remoteTabTitleFormatChanged(const QString& format)
 
 void EditProfileDialog::selectIcon()
 {
-    const QString& icon = KIconDialog::getIcon();
+    const QString& icon = KIconDialog::getIcon(KIconLoader::Desktop, KIconLoader::Application,
+                                               false, 0, false, this);
     if (!icon.isEmpty())
     {
         _ui->iconSelectButton->setIcon( KIcon(icon) );
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index b226e9773..c6bb61ea0 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -316,7 +316,7 @@ bool MainWindow::queryClose()
 void MainWindow::showShortcutsDialog()
 {
     KShortcutsDialog::configure( actionCollection() ,
-                                 KShortcutsEditor::LetterShortcutsDisallowed );
+                                 KShortcutsEditor::LetterShortcutsDisallowed, this );
 }
 
 void MainWindow::newFromProfile(const QString& key)
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 49b6cdf0d..0eeb10aab 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -610,7 +610,7 @@ void SessionController::renameSession()
     const QString& text = KInputDialog::getText( i18n("Rename Tab") ,
                                                  i18n("Enter new tab text:") ,
                                                  _session->tabTitleFormat(Session::LocalTabTitle) ,
-                                                 &ok );
+                                                 &ok, QApplication::activeWindow() );
     if ( ok )
     {
         _session->setTabTitleFormat(Session::LocalTabTitle,text);
@@ -831,7 +831,7 @@ void SessionController::scrollBackOptionsChanged( int mode , int lines )
 
 void SessionController::saveHistory()
 {
-    SessionTask* task = new SaveHistoryTask();
+    SessionTask* task = new SaveHistoryTask(this);
     task->setAutoDelete(true);
     task->addSession( _session );
     task->execute();
@@ -988,7 +988,7 @@ void SaveHistoryTask::execute()
     //
 
      KFileDialog* dialog = new KFileDialog( QString(":konsole") /* check this */,
-                                               QString() , 0 /* no parent widget */);
+                                               QString(), QApplication::activeWindow() );
      QStringList mimeTypes;
      mimeTypes << "text/plain";
      mimeTypes << "text/html";