diff --git a/src/apps/terminal/HistoryBuffer.cpp b/src/apps/terminal/HistoryBuffer.cpp
index 63cafb7f03..ad94f72590 100644
--- a/src/apps/terminal/HistoryBuffer.cpp
+++ b/src/apps/terminal/HistoryBuffer.cpp
@@ -79,7 +79,7 @@ HistoryBuffer::GetTerminalLineAt(int32 index, TerminalLine* buffer) const
 	int32 charCount = 0;
 	const char* chars = line->Chars();
 	buffer->length = 0;
-	uint16 attributes = 0;
+	uint32 attributes = 0;
 	AttributesRun* attributesRun = line->AttributesRuns();
 	int32 attributesRunCount = line->attributesRunCount;
 	int32 nextAttributesAt = attributesRunCount > 0
@@ -128,7 +128,7 @@ HistoryBuffer::AddLine(const TerminalLine* line)
 {
 //debug_printf("HistoryBuffer::AddLine(%p): length: %d\n", line, line->length);
 	// determine the amount of memory we need for the line
-	uint16 attributes = 0;
+	uint32 attributes = 0;
 	int32 attributesRuns = 0;
 	int32 byteLength = 0;
 	for (int32 i = 0; i < line->length; i++) {
diff --git a/src/apps/terminal/TerminalLine.h b/src/apps/terminal/TerminalLine.h
index a2b337b671..5a7147de12 100644
--- a/src/apps/terminal/TerminalLine.h
+++ b/src/apps/terminal/TerminalLine.h
@@ -30,7 +30,7 @@ struct TerminalLine {
 
 
 struct AttributesRun {
-	uint16	attributes;
+	uint32	attributes;
 	uint16	offset;			// character offset
 	uint16	length;			// length of the run in characters
 };