diff --git a/kdevplatform/language/codecompletion/abstractincludefilecompletionitem.h b/kdevplatform/language/codecompletion/abstractincludefilecompletionitem.h
--- a/kdevplatform/language/codecompletion/abstractincludefilecompletionitem.h
+++ b/kdevplatform/language/codecompletion/abstractincludefilecompletionitem.h
@@ -52,7 +52,6 @@
         return QVariant(true);
       case CodeCompletionModel::ExpandingWidget: {
         NavigationWidget* nav = new NavigationWidget(item, model->currentTopContext());
-        model->addNavigationWidget(this, nav);
 
         QVariant v;
         v.setValue<QWidget*>((QWidget*)nav);
diff --git a/kdevplatform/language/codecompletion/codecompletionitem.h b/kdevplatform/language/codecompletion/codecompletionitem.h
--- a/kdevplatform/language/codecompletion/codecompletionitem.h
+++ b/kdevplatform/language/codecompletion/codecompletionitem.h
@@ -108,7 +108,6 @@
   /// Should return normal completion data, @see KTextEditor::CodeCompletionModel
   /// The default implementation returns "unimplemented", so re-implement it!
   /// The duchain is not locked when this is called
-  /// Navigation-widgets should be registered to the model, then it will care about the interaction.
   virtual QVariant data(const QModelIndex& index, int role, const CodeCompletionModel* model) const;
   
   /// Should return the inheritance-depth. The completion-items don't need to return it through the data() function.
diff --git a/kdevplatform/language/codecompletion/codecompletionmodel.h b/kdevplatform/language/codecompletion/codecompletionmodel.h
--- a/kdevplatform/language/codecompletion/codecompletionmodel.h
+++ b/kdevplatform/language/codecompletion/codecompletionmodel.h
@@ -85,9 +85,6 @@
     KDevelop::TopDUContextPointer currentTopContext() const;
     void setCurrentTopContext(const KDevelop::TopDUContextPointer& topContext);
 
-    ///Tracks navigation widget so they can be interactive with through the keyboard later on
-    void addNavigationWidget(const CompletionTreeElement* element, QWidget* widget) const;
-
     ///Whether the completion should be fully detailed. If false, it should be simplifed, so no argument-hints,
     ///no expanding information, no type-information, etc.
     bool fullCompletion() const;
@@ -123,7 +120,6 @@
     QExplicitlySharedDataPointer<CodeCompletionContext> m_completionContext;
     typedef QPair<KDevelop::DeclarationPointer, QExplicitlySharedDataPointer<CodeCompletionContext> > DeclarationContextPair;
 
-    mutable QMap<const CompletionTreeElement*, QPointer<QWidget> > m_navigationWidgets;
     QList< QExplicitlySharedDataPointer<CompletionTreeElement> > m_completionItems;
 
     /// Should create a completion-worker. The worker must have no parent object,
diff --git a/kdevplatform/language/codecompletion/codecompletionmodel.cpp b/kdevplatform/language/codecompletion/codecompletionmodel.cpp
--- a/kdevplatform/language/codecompletion/codecompletionmodel.cpp
+++ b/kdevplatform/language/codecompletion/codecompletionmodel.cpp
@@ -125,13 +125,6 @@
   delete m_mutex;
 }
 
-void CodeCompletionModel::addNavigationWidget(const CompletionTreeElement* element, QWidget* widget) const
-{
-  Q_ASSERT(dynamic_cast<QuickOpenEmbeddedWidgetInterface*>(widget));
-  m_navigationWidgets[element] = widget;
-}
-
-
 bool CodeCompletionModel::fullCompletion() const
 {
   return m_fullCompletion;
@@ -145,7 +138,6 @@
 {
   beginResetModel();
   m_completionItems.clear();
-  m_navigationWidgets.clear();
   m_completionContext.reset();
   endResetModel();
 }
@@ -166,7 +158,6 @@
     qCDebug(LANGUAGE) << "================== NO CONTEXT FOUND =======================";
     beginResetModel();
     m_completionItems.clear();
-    m_navigationWidgets.clear();
     endResetModel();
 
     qCDebug(LANGUAGE) << "Completion invoked for unknown context. Document:" << url << ", Known documents:" << DUChain::self()->documents();
@@ -228,7 +219,6 @@
   }
 
   beginResetModel();
-  m_navigationWidgets.clear();
   m_completionItems.clear();
   endResetModel();
 
diff --git a/kdevplatform/language/codecompletion/normaldeclarationcompletionitem.cpp b/kdevplatform/language/codecompletion/normaldeclarationcompletionitem.cpp
--- a/kdevplatform/language/codecompletion/normaldeclarationcompletionitem.cpp
+++ b/kdevplatform/language/codecompletion/normaldeclarationcompletionitem.cpp
@@ -198,7 +198,6 @@
     case CodeCompletionModel::ExpandingWidget: {
       QWidget* nav = createExpandingWidget(model);
       Q_ASSERT(nav);
-      model->addNavigationWidget(this, nav);
 
       QVariant v;
       v.setValue<QWidget*>(nav);