diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 625be439674535274c6dd912a4641c39e39301cb..d905a538fd9ec28ea61526d06333b3e01f124dc2 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -427,7 +427,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
         advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT);
 
         a = new QAction(tr("Reset Font Size"), this);
-        cmd = am->registerAction(a,  TextEditor::Constants::DECREASE_FONT_SIZE,
+        cmd = am->registerAction(a,  TextEditor::Constants::RESET_FONT_SIZE,
             modecontext);
         cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+0")));
         connect(a, SIGNAL(triggered()), m_centralWidget, SLOT(resetZoom()));
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 2e30a1487e8562db4d42bebba9654a149484a0ef..2a20ed857c4bf0b01fd581d19795f71895f46470 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -4179,6 +4179,14 @@ void BaseTextEditor::changeEvent(QEvent *e)
     }
 }
 
+void BaseTextEditor::focusOutEvent(QFocusEvent *e)
+{
+    QPlainTextEdit::focusOutEvent(e);
+    if (viewport()->cursor().shape() == Qt::BlankCursor)
+        viewport()->setCursor(Qt::IBeamCursor);
+}
+
+
 void BaseTextEditor::maybeSelectLine()
 {
     QTextCursor cursor = textCursor();
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 092d6c7f4b89cabc41418b4716b1e591213284f4..6c135b86f3caf6904c41cc37b20954c1d729732a 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -418,6 +418,7 @@ protected:
     void keyPressEvent(QKeyEvent *e);
     void wheelEvent(QWheelEvent *e);
     void changeEvent(QEvent *e);
+    void focusOutEvent(QFocusEvent *e);
 
     void showEvent(QShowEvent *);