diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index aeba818cbf3b8038eaaa2e5e81333b1ccbfccb40..c7cda11081ee81d266dc9ef33e5a32af3e2328b5 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -760,7 +760,6 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
             foreach (const Document::Block &block, doc->skippedBlocks()) {
                 blockRanges.append(TextEditor::BaseTextEditor::BlockRange(block.begin(), block.end()));
             }
-            ed->setIfdefedOutBlocks(blockRanges);
 
             QList<QTextEdit::ExtraSelection> selections;
 
@@ -827,6 +826,7 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
             Editor e;
             e.widget = ed;
             e.selections = selections;
+            e.ifdefedOutBlocks = blockRanges;
             todo.append(e);
             m_todo = todo;
             postEditorUpdate();
@@ -848,6 +848,8 @@ void CppModelManager::updateEditorSelections()
 
         ed.widget->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
                                       ed.selections);
+
+        ed.widget->setIfdefedOutBlocks(ed.ifdefedOutBlocks);
     }
 
     m_todo.clear();
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index fb645ffe8f3c4502ed508c529971535c7e626c89..58c3e81f633fe62ebbb232e6f1ffda26b3445062 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -38,6 +38,8 @@
 #include <projectexplorer/project.h>
 #include <cplusplus/CppDocument.h>
 
+#include <texteditor/basetexteditor.h>
+
 #include <QMap>
 #include <QFutureInterface>
 #include <QMutex>
@@ -171,6 +173,7 @@ private:
     struct Editor {
         QPointer<TextEditor::BaseTextEditor> widget;
         QList<QTextEdit::ExtraSelection> selections;
+        QList<TextEditor::BaseTextEditor::BlockRange> ifdefedOutBlocks;
     };
 
     QList<Editor> m_todo;