diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 6d3749b45f9..e96532e60ed 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -562,9 +562,8 @@ void RegisterHandler::setNumberFormat(const QString &name, RegisterFormat format
 RegisterMap RegisterHandler::registerMap() const
 {
     RegisterMap result;
-    Utils::TreeItem *root = rootItem();
-    for (int i = 0, n = root->rowCount(); i != n; ++i) {
-        RegisterItem *reg = static_cast<RegisterItem *>(root->child(i));
+    for (int i = 0, n = rootItem()->childCount(); i != n; ++i) {
+        RegisterItem *reg = rootItem()->childAt(i);
         quint64 value = reg->addressValue();
         if (value)
             result.insert(value, reg->m_reg.name);
diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h
index 96293cfa1e0..5394eee00ed 100644
--- a/src/plugins/debugger/registerhandler.h
+++ b/src/plugins/debugger/registerhandler.h
@@ -115,9 +115,13 @@ public:
 };
 
 class RegisterItem;
+class RegisterSubItem;
+using RegisterRootItem = Utils::TypedTreeItem<RegisterItem>;
+
 typedef QMap<quint64, QString> RegisterMap;
 
-class RegisterHandler : public Utils::TreeModel
+class RegisterHandler
+    : public Utils::LeveledTreeModel<RegisterRootItem, RegisterItem, RegisterSubItem>
 {
     Q_OBJECT