diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index fdffd25d7987a767800eff061ef288ee73f72104..844adcfb021bc9e5702395c235c3264ad83b3d05 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -168,6 +168,27 @@ void GlslEditorWidget::ctor()
 
     new Highlighter(textDocument());
 
+    m_outlineCombo = new QComboBox;
+    m_outlineCombo->setMinimumContentsLength(22);
+
+    // ### m_outlineCombo->setModel(m_outlineModel);
+
+    QTreeView *treeView = new QTreeView;
+    treeView->header()->hide();
+    treeView->setItemsExpandable(false);
+    treeView->setRootIsDecorated(false);
+    m_outlineCombo->setView(treeView);
+    treeView->expandAll();
+
+    //m_outlineCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+    // Make the combo box prefer to expand
+    QSizePolicy policy = m_outlineCombo->sizePolicy();
+    policy.setHorizontalPolicy(QSizePolicy::Expanding);
+    m_outlineCombo->setSizePolicy(policy);
+
+    insertExtraToolBarWidget(TextEditor::BaseTextEditorWidget::Left, m_outlineCombo);
+
 //    if (m_modelManager) {
 //        m_semanticHighlighter->setModelManager(m_modelManager);
 //        connect(m_modelManager, SIGNAL(documentUpdated(GLSL::Document::Ptr)),
@@ -222,33 +243,7 @@ QString GlslEditorWidget::wordUnderCursor() const
 
 TextEditor::BaseTextEditor *GlslEditorWidget::createEditor()
 {
-    GlslEditor *editable = new GlslEditor(this);
-    createToolBar(editable);
-    return editable;
-}
-
-void GlslEditorWidget::createToolBar(GlslEditor *editor)
-{
-    m_outlineCombo = new QComboBox;
-    m_outlineCombo->setMinimumContentsLength(22);
-
-    // ### m_outlineCombo->setModel(m_outlineModel);
-
-    QTreeView *treeView = new QTreeView;
-    treeView->header()->hide();
-    treeView->setItemsExpandable(false);
-    treeView->setRootIsDecorated(false);
-    m_outlineCombo->setView(treeView);
-    treeView->expandAll();
-
-    //m_outlineCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-
-    // Make the combo box prefer to expand
-    QSizePolicy policy = m_outlineCombo->sizePolicy();
-    policy.setHorizontalPolicy(QSizePolicy::Expanding);
-    m_outlineCombo->setSizePolicy(policy);
-
-    insertExtraToolBarWidget(TextEditor::BaseTextEditorWidget::Left, m_outlineCombo);
+    return new GlslEditor(this);
 }
 
 void GlslEditorWidget::updateDocument()
diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h
index 39f185a75492aad0c3c6a43d494b939abcf9e30d..380a7be537f58fa14fdeb28831ff6820176d0579 100644
--- a/src/plugins/glsleditor/glsleditor.h
+++ b/src/plugins/glsleditor/glsleditor.h
@@ -105,7 +105,6 @@ private slots:
 
 protected:
     TextEditor::BaseTextEditor *createEditor();
-    void createToolBar(Internal::GlslEditor *editable);
 
 private:
     GlslEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity