diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index d011b0af646..6a7e830e61b 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -49,7 +49,6 @@
 #include <cpptools/cppcompletionassistprovider.h>
 #include <cpptools/cpphighlightingsupport.h>
 #include <cpptools/cppmodelmanagerinterface.h>
-#include <cpptools/cppqtstyleindenter.h>
 #include <cpptools/cppsemanticinfo.h>
 #include <cpptools/cpptoolseditorsupport.h>
 #include <cpptools/cpptoolsplugin.h>
@@ -179,7 +178,6 @@ CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q)
 CppEditorWidget::CppEditorWidget(QWidget *parent)
     : TextEditor::BaseTextEditorWidget(new CPPEditorDocument(), parent)
 {
-    textDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
     ctor();
 }
 
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index 854baceb506..d91126f84bc 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -33,6 +33,7 @@
 #include "cpphighlighter.h"
 
 #include <cpptools/cppcodeformatter.h>
+#include <cpptools/cppqtstyleindenter.h>
 #include <cpptools/cpptoolsconstants.h>
 
 #include <QTextDocument>
@@ -48,6 +49,7 @@ CPPEditorDocument::CPPEditorDocument()
     connect(this, SIGNAL(mimeTypeChanged()),
             this, SLOT(onMimeTypeChanged()));
     setSyntaxHighlighter(new CppHighlighter);
+    setIndenter(new CppTools::CppQtStyleIndenter);
     onMimeTypeChanged();
 }