diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp
index c937c1cc999..f7be0fe8dda 100755
--- a/src/plugins/todo/todooutputpane.cpp
+++ b/src/plugins/todo/todooutputpane.cpp
@@ -182,7 +182,7 @@ void TodoOutputPane::createTreeView()
     m_todoTreeView = new TodoOutputTreeView();
     m_todoTreeView->setModel(m_todoItemsModel);
 
-    connect(m_todoTreeView, SIGNAL(clicked(QModelIndex)), SLOT(todoTreeViewClicked(QModelIndex)));
+    connect(m_todoTreeView, SIGNAL(activated(QModelIndex)), SLOT(todoTreeViewClicked(QModelIndex)));
 }
 
 void TodoOutputPane::freeTreeView()
diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp
index 86cbe494295..8ae3af9e69f 100644
--- a/src/plugins/todo/todooutputtreeview.cpp
+++ b/src/plugins/todo/todooutputtreeview.cpp
@@ -40,7 +40,7 @@ namespace Todo {
 namespace Internal {
 
 TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) :
-    QTreeView(parent),
+    Utils::TreeView(parent),
     m_textColumnDefaultWidth(0),
     m_fileColumnDefaultWidth(0)
 {
@@ -105,18 +105,6 @@ void TodoOutputTreeView::resizeEvent(QResizeEvent *event)
     setColumnWidth(Constants::OUTPUT_COLUMN_FILE, widthFile);
 }
 
-void TodoOutputTreeView::keyPressEvent(QKeyEvent *e)
-{
-    if (!e->modifiers()
-            && (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter)
-            && currentIndex().isValid()) {
-        emit clicked(currentIndex());
-        e->accept();
-        return;
-    }
-    QTreeView::keyPressEvent(e);
-}
-
 void TodoOutputTreeView::todoColumnResized(int column, int oldSize, int newSize)
 {
     Q_UNUSED(oldSize);
diff --git a/src/plugins/todo/todooutputtreeview.h b/src/plugins/todo/todooutputtreeview.h
index 4b4d9a40f59..36ad26e2630 100644
--- a/src/plugins/todo/todooutputtreeview.h
+++ b/src/plugins/todo/todooutputtreeview.h
@@ -30,12 +30,12 @@
 #ifndef TODO_INTERNAL_TODOOUTPUTTREEVIEW_H
 #define TODO_INTERNAL_TODOOUTPUTTREEVIEW_H
 
-#include <QTreeView>
+#include <utils/itemviews.h>
 
 namespace Todo {
 namespace Internal {
 
-class TodoOutputTreeView : public QTreeView
+class TodoOutputTreeView : public Utils::TreeView
 {
     Q_OBJECT
 public:
@@ -43,7 +43,6 @@ public:
     ~TodoOutputTreeView();
 
     void resizeEvent(QResizeEvent *event);
-    void keyPressEvent(QKeyEvent *e);
 
 private slots:
     void todoColumnResized(int column, int oldSize, int newSize);