diff --git a/src/apps/debugger/dwarf/DebugInfoEntries.cpp b/src/apps/debugger/dwarf/DebugInfoEntries.cpp
index 3942c0a888..5a1698e739 100644
--- a/src/apps/debugger/dwarf/DebugInfoEntries.cpp
+++ b/src/apps/debugger/dwarf/DebugInfoEntries.cpp
@@ -471,7 +471,14 @@ DIEClassBaseType::AddChild(DebugInfoEntry* child)
 // TODO: Templates!
 // TODO: Variants!
 		default:
+		{
+			if (child->IsType()) {
+				fInnerTypes.Add(child);
+				return B_OK;
+			}
+
 			return DIECompoundType::AddChild(child);
+		}
 	}
 }
 
diff --git a/src/apps/debugger/dwarf/DebugInfoEntries.h b/src/apps/debugger/dwarf/DebugInfoEntries.h
index 1cd4c2908f..f0cdf645a7 100644
--- a/src/apps/debugger/dwarf/DebugInfoEntries.h
+++ b/src/apps/debugger/dwarf/DebugInfoEntries.h
@@ -343,6 +343,7 @@ protected:
 			DebugInfoEntryList	fFriends;
 			DebugInfoEntryList	fAccessDeclarations;
 			DebugInfoEntryList	fMemberFunctions;
+			DebugInfoEntryList	fInnerTypes;
 };