diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 8ccfe38e0d0..fbdd18d722c 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
-#include <QtGui/QMessageBox>
 #include <QtGui/QMainWindow>
 
 #include <QtCore/QCoreApplication>
@@ -219,9 +218,12 @@ void GeneralSettings::resetFileBrowser()
 #endif
 
 
-void GeneralSettings::variableHelpDialogCreator(const QString& helpText)
+void GeneralSettings::variableHelpDialogCreator(const QString &helpText)
 {
     if (m_dialog) {
+        if (m_dialog->text() != helpText)
+            m_dialog->setText(helpText);
+
         m_dialog->show();
         m_dialog->raise();
         m_dialog->activateWindow();
diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index b35bd4efdda..47ef4d18acd 100644
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -32,7 +32,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QtGui/QMessageBox>
 
 namespace Core {
 namespace Internal {
@@ -71,13 +71,13 @@ private slots:
 #endif
 
 private:
-    void variableHelpDialogCreator(const QString& helpText);
+    void variableHelpDialogCreator(const QString &helpText);
     void fillLanguageBox() const;
     QString language() const;
     void setLanguage(const QString&);
     Ui::GeneralSettings *m_page;
     QString m_searchKeywords;
-    QPointer<QWidget> m_dialog;
+    QPointer<QMessageBox> m_dialog;
 };
 
 } // namespace Internal