diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java
index 529d73a2b..8209ef055 100644
--- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java
+++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java
@@ -198,10 +198,11 @@ public Color getColor(IItem item) {
 
 		// FIXME: Handle ColorProvider and combined events
 		Map<String, Integer> columnsOrderMap = new HashMap<>();
-		columnsOrderMap.put(createColumnId(JfrAttributes.START_TIME), 1);
-		columnsOrderMap.put(createColumnId(JfrAttributes.DURATION), 2);
-		columnsOrderMap.put(createColumnId(JfrAttributes.END_TIME), 3);
-		columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_THREAD), 4);
+		columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_TYPE), 1);
+		columnsOrderMap.put(createColumnId(JfrAttributes.START_TIME), 2);
+		columnsOrderMap.put(createColumnId(JfrAttributes.DURATION), 3);
+		columnsOrderMap.put(createColumnId(JfrAttributes.END_TIME), 4);
+		columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_THREAD), 5);
 		DEFAULT_COLUMNS_ORDER = Collections.unmodifiableMap(columnsOrderMap);
 	}
 
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java
index 8dd8b2dff..acf033701 100644
--- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java
+++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java
@@ -312,7 +312,6 @@ private void rebuildItemList() {
 			}
 
 			// FIXME: Possibly move to attribute toolkit/handler?
-			// FIXME: Make sure to get Event Type as the first column
 			// FIXME: Stream<IType> -> Stream<IAttribute> should be delegated to some context (e.g. the editor)
 			Stream<IAttribute<?>> commonAttributes = Stream.empty();
 			if (types.hasNext()) {