diff --git a/src/kedittoolbar.cpp b/src/kedittoolbar.cpp
--- a/src/kedittoolbar.cpp
+++ b/src/kedittoolbar.cpp
@@ -617,7 +617,6 @@
     q->setDefaultToolBar(QString());
 
     q->setWindowTitle(i18n("Configure Toolbars"));
-    q->setModal(false);
 
     m_layout = new QVBoxLayout;
     q->setLayout(m_layout);
@@ -1710,17 +1709,13 @@
             // call the action collection version
             d->m_widget->load(d->m_file, d->m_global, d->m_defaultToolBar);
         }
-
-        KToolBar::setToolBarsEditable(true);
     }
     QDialog::showEvent(event);
 }
 
+// TODO KF6: remove.
 void KEditToolBar::hideEvent(QHideEvent *event)
 {
-    // The dialog has been hidden, disable toolbar editing
-    KToolBar::setToolBarsEditable(false);
-
     QDialog::hideEvent(event);
 }
 
diff --git a/src/ktoolbar.h b/src/ktoolbar.h
--- a/src/ktoolbar.h
+++ b/src/ktoolbar.h
@@ -215,9 +215,7 @@
     static bool toolBarsEditable();
 
     /**
-     * Enable or disable toolbar editing via drag & drop of actions.  This is
-     * called by KEditToolBar and should generally be set to disabled whenever
-     * KEditToolBar is not active.
+     * Enable or disable toolbar editing via drag & drop of actions.
      */
     static void setToolBarsEditable(bool editable);
 
diff --git a/src/kxmlguiwindow.h b/src/kxmlguiwindow.h
--- a/src/kxmlguiwindow.h
+++ b/src/kxmlguiwindow.h
@@ -303,6 +303,7 @@
 public Q_SLOTS:
     /**
      * Show a standard configure toolbar dialog.
+     * The default implementation shows the dialog as modal.
      *
      * This slot can be connected directly to the action to configure toolbar.
      * This is very simple to do that by adding a single line
diff --git a/src/kxmlguiwindow.cpp b/src/kxmlguiwindow.cpp
--- a/src/kxmlguiwindow.cpp
+++ b/src/kxmlguiwindow.cpp
@@ -161,7 +161,7 @@
         d->toolBarEditor->setAttribute(Qt::WA_DeleteOnClose);
         connect(d->toolBarEditor, SIGNAL(newToolBarConfig()), SLOT(saveNewToolbarConfig()));
     }
-    d->toolBarEditor->show();
+    d->toolBarEditor->open();
 }
 
 void KXmlGuiWindow::saveNewToolbarConfig()