diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73f4e7b4b..95d88c815 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,6 +29,7 @@ set(keepassx_SOURCES
     core/Writer.cpp
     gui/EntryModel.cpp
     gui/GroupModel.cpp
+    gui/GroupView.cpp
 )
 
 automoc4_add_library( keepassx_core STATIC ${keepassx_SOURCES} )
diff --git a/src/gui/GroupModel.cpp b/src/gui/GroupModel.cpp
index f79d2a00e..351e27452 100644
--- a/src/gui/GroupModel.cpp
+++ b/src/gui/GroupModel.cpp
@@ -124,6 +124,20 @@ QVariant GroupModel::headerData(int section, Qt::Orientation orientation, int ro
     return QVariant();
 }
 
+QModelIndex GroupModel::index(const Group* group) const
+{
+    int row;
+
+    if (!group->parentGroup()) {
+        row = 0;
+    }
+    else {
+        row = group->parentGroup()->children().indexOf(group);
+    }
+
+    return createIndex(row, 0, group);
+}
+
 QModelIndex GroupModel::createIndex(int row, int column, const Group* group) const
 {
     return QAbstractItemModel::createIndex(row, column, const_cast<Group*>(group));
@@ -138,17 +152,8 @@ const Group* GroupModel::groupFromIndex(const QModelIndex& index) const
 
 void GroupModel::groupDataChanged(const Group* group)
 {
-    int row;
-
-    if (!group->parentGroup()) {
-        row = 0;
-    }
-    else {
-        row = group->parentGroup()->children().indexOf(group);
-    }
-
-    QModelIndex index = createIndex(row, 0, group);
-    Q_EMIT dataChanged(index, index);
+    QModelIndex ix = index(group);
+    Q_EMIT dataChanged(ix, ix);
 }
 
 void GroupModel::groupAboutToRemove(const Group* group)
diff --git a/src/gui/GroupModel.h b/src/gui/GroupModel.h
index 7689ef6b2..f8ca6c053 100644
--- a/src/gui/GroupModel.h
+++ b/src/gui/GroupModel.h
@@ -29,6 +29,8 @@ class GroupModel : public QAbstractItemModel
 
 public:
     explicit GroupModel(const Database* db, QObject* parent = 0);
+    QModelIndex index(const Group* group) const;
+    const Group* groupFromIndex(const QModelIndex& index) const;
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
     int columnCount(const QModelIndex& parent = QModelIndex()) const;
@@ -39,7 +41,6 @@ public:
 
 private:
     QModelIndex createIndex(int row, int column, const Group* group) const;
-    const Group* groupFromIndex(const QModelIndex& index) const;
     QModelIndex parent(const Group* group) const;
 
 private Q_SLOTS:
diff --git a/src/gui/GroupView.cpp b/src/gui/GroupView.cpp
new file mode 100644
index 000000000..1c351c9ce
--- /dev/null
+++ b/src/gui/GroupView.cpp
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GroupView.h"
+
+#include "core/Database.h"
+#include "core/Group.h"
+#include "gui/GroupModel.h"
+
+GroupView::GroupView(Database* db, QWidget* parent) : QTreeView(parent)
+{
+    model = new GroupModel(db, this);
+    QTreeView::setModel(model);
+    recInitExpanded(db->rootGroup());
+    setHeaderHidden(true);
+}
+
+void GroupView::expandedChanged(const QModelIndex& index)
+{
+    Group* group = const_cast<Group*>(model->groupFromIndex(index));
+    group->setExpanded(isExpanded(index));
+}
+
+void GroupView::recInitExpanded(const Group* group)
+{
+    QModelIndex index = model->index(group);
+    setExpanded(index, group->isExpanded());
+
+    Q_FOREACH (const Group* child, group->children()) {
+        recInitExpanded(child);
+    }
+}
+
+void GroupView::setModel(QAbstractItemModel* model)
+{
+    Q_UNUSED(model);
+    Q_ASSERT(false);
+}
diff --git a/src/gui/GroupView.h b/src/gui/GroupView.h
new file mode 100644
index 000000000..3c1ed8903
--- /dev/null
+++ b/src/gui/GroupView.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_GROUPVIEW_H
+#define KEEPASSX_GROUPVIEW_H
+
+#include <QtGui/QTreeView>
+
+class Database;
+class Group;
+class GroupModel;
+
+class GroupView : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    GroupView(Database* db, QWidget* parent = 0);
+    void setModel(QAbstractItemModel* model);
+
+private Q_SLOTS:
+    void expandedChanged(const QModelIndex& index);
+
+private:
+    void recInitExpanded(const Group* group);
+
+    Database* db;
+    GroupModel* model;
+};
+
+#endif // KEEPASSX_GROUPVIEW_H