diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 4f3333731825c7fd59d621c3c1997dc1a00458f7..af6bdb01706d3ef6d116d225c3e453cf87cee5a3 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -195,11 +195,9 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
     d->m_searchResultOverlay = new TextEditorOverlay(this);
     d->m_refactorOverlay = new RefactorOverlay(this);
 
-    d->setupDocumentSignals(d->m_document);
     d->setupDocumentSignals(d->m_document);
 
     d->m_lastScrollPos = -1;
-    setCursorWidth(2);
 
     // from RESEARCH
 
@@ -1987,8 +1985,9 @@ void BaseTextEditorPrivate::setupDocumentSignals(BaseTextDocument *document)
         doc->setDocumentLayout(documentLayout);
     }
 
-
     q->setDocument(doc);
+    q->setCursorWidth(2); // Applies to the document layout
+
     QObject::connect(documentLayout, SIGNAL(updateBlock(QTextBlock)), q, SLOT(slotUpdateBlockNotify(QTextBlock)));
     QObject::connect(q, SIGNAL(requestBlockUpdate(QTextBlock)), documentLayout, SIGNAL(updateBlock(QTextBlock)));
     QObject::connect(doc, SIGNAL(modificationChanged(bool)), q, SIGNAL(changed()));