diff --git a/src/components/tooltip/Marker.js b/src/components/tooltip/Marker.js
index 561b92d80c..f6a4d7a1f7 100644
--- a/src/components/tooltip/Marker.js
+++ b/src/components/tooltip/Marker.js
@@ -241,6 +241,17 @@ class MarkerTooltipContents extends React.PureComponent<Props> {
       // Add the details for the markers based on their Marker schema.
       const schema = getSchemaFromMarker(markerSchemaByName, marker.data);
       if (schema) {
+        if (schema.description) {
+          const key = schema.name + '-description';
+          details.push(
+            <TooltipDetail key={key} label="Description">
+              <div className="tooltipDetailsDescription">
+                {schema.description}
+              </div>
+            </TooltipDetail>
+          );
+        }
+
         for (const field of schema.fields) {
           if (field.hidden) {
             // Do not include hidden fields.
@@ -268,17 +279,6 @@ class MarkerTooltipContents extends React.PureComponent<Props> {
             </TooltipDetail>
           );
         }
-
-        if (schema.description) {
-          const key = schema.name + '-description';
-          details.push(
-            <TooltipDetail key={key} label="Description">
-              <div className="tooltipDetailsDescription">
-                {schema.description}
-              </div>
-            </TooltipDetail>
-          );
-        }
       }
 
       switch (data.type) {
diff --git a/src/test/components/__snapshots__/MarkerChart.test.js.snap b/src/test/components/__snapshots__/MarkerChart.test.js.snap
index 7e9cfd7000..e53e60fa3e 100644
--- a/src/test/components/__snapshots__/MarkerChart.test.js.snap
+++ b/src/test/components/__snapshots__/MarkerChart.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MarkerChart EmptyReasons shows a reason when a profile has no markers 1`] = `
 <div
@@ -191,28 +191,28 @@ exports[`MarkerChart persists the selected marker tooltips properly 1`] = `
       <div
         class="tooltipLabel"
       >
-        Name
+        Description
         :
       </div>
-      Marker B
       <div
-        class="tooltipLabel"
+        class="tooltipDetailsDescription"
       >
-        Entry Type
-        :
+        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
       </div>
-      measure
       <div
         class="tooltipLabel"
       >
-        Description
+        Name
         :
       </div>
+      Marker B
       <div
-        class="tooltipDetailsDescription"
+        class="tooltipLabel"
       >
-        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
+        Entry Type
+        :
       </div>
+      measure
       <div
         class="tooltipLabel"
       >
@@ -374,28 +374,28 @@ exports[`MarkerChart renders the hoveredItem markers properly 2`] = `
       <div
         class="tooltipLabel"
       >
-        Name
+        Description
         :
       </div>
-      Marker B
       <div
-        class="tooltipLabel"
+        class="tooltipDetailsDescription"
       >
-        Entry Type
-        :
+        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
       </div>
-      measure
       <div
         class="tooltipLabel"
       >
-        Description
+        Name
         :
       </div>
+      Marker B
       <div
-        class="tooltipDetailsDescription"
+        class="tooltipLabel"
       >
-        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
+        Entry Type
+        :
       </div>
+      measure
       <div
         class="tooltipLabel"
       >
diff --git a/src/test/components/__snapshots__/StackChart.test.js.snap b/src/test/components/__snapshots__/StackChart.test.js.snap
index cb4747d4e4..bd0e3dca1d 100644
--- a/src/test/components/__snapshots__/StackChart.test.js.snap
+++ b/src/test/components/__snapshots__/StackChart.test.js.snap
@@ -869,28 +869,28 @@ exports[`MarkerChart shows a tooltip when hovering 1`] = `
       <div
         class="tooltipLabel"
       >
-        Name
+        Description
         :
       </div>
-      componentB
       <div
-        class="tooltipLabel"
+        class="tooltipDetailsDescription"
       >
-        Entry Type
-        :
+        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
       </div>
-      measure
       <div
         class="tooltipLabel"
       >
-        Description
+        Name
         :
       </div>
+      componentB
       <div
-        class="tooltipDetailsDescription"
+        class="tooltipLabel"
       >
-        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
+        Entry Type
+        :
       </div>
+      measure
       <div
         class="tooltipLabel"
       >
@@ -936,28 +936,28 @@ exports[`MarkerChart shows a tooltip when hovering 2`] = `
       <div
         class="tooltipLabel"
       >
-        Name
+        Description
         :
       </div>
-      componentA
       <div
-        class="tooltipLabel"
+        class="tooltipDetailsDescription"
       >
-        Entry Type
-        :
+        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
       </div>
-      measure
       <div
         class="tooltipLabel"
       >
-        Description
+        Name
         :
       </div>
+      componentA
       <div
-        class="tooltipDetailsDescription"
+        class="tooltipLabel"
       >
-        UserTiming is created using the DOM APIs performance.mark() and performance.measure().
+        Entry Type
+        :
       </div>
+      measure
       <div
         class="tooltipLabel"
       >
diff --git a/src/test/components/__snapshots__/TooltipMarker.test.js.snap b/src/test/components/__snapshots__/TooltipMarker.test.js.snap
index 7d58b48927..18acd2e838 100644
--- a/src/test/components/__snapshots__/TooltipMarker.test.js.snap
+++ b/src/test/components/__snapshots__/TooltipMarker.test.js.snap
@@ -4684,28 +4684,28 @@ exports[`TooltipMarker renders tooltips for various markers: UserTiming-12.5 1`]
     <div
       class="tooltipLabel"
     >
-      Name
+      Description
       :
     </div>
-    foobar
     <div
-      class="tooltipLabel"
+      class="tooltipDetailsDescription"
     >
-      Entry Type
-      :
+      UserTiming is created using the DOM APIs performance.mark() and performance.measure().
     </div>
-    mark
     <div
       class="tooltipLabel"
     >
-      Description
+      Name
       :
     </div>
+    foobar
     <div
-      class="tooltipDetailsDescription"
+      class="tooltipLabel"
     >
-      UserTiming is created using the DOM APIs performance.mark() and performance.measure().
+      Entry Type
+      :
     </div>
+    mark
     <div
       class="tooltipLabel"
     >