diff --git a/src/components/timeline/FullTimeline.tsx b/src/components/timeline/FullTimeline.tsx
index 32fa0629b2..35b0c38db2 100644
--- a/src/components/timeline/FullTimeline.tsx
+++ b/src/components/timeline/FullTimeline.tsx
@@ -155,10 +155,14 @@ class FullTimelineImpl extends React.PureComponent<Props, State> {
       <>
         <TimelineSelection width={width}>
           <div className="timelineHeader">
-            <TimelineSettingsHiddenTracks
-              hiddenTrackCount={hiddenTrackCount}
-              changeRightClickedTrack={changeRightClickedTrack}
-            />
+            {hiddenTrackCount.total > 1 ? (
+              <TimelineSettingsHiddenTracks
+                hiddenTrackCount={hiddenTrackCount}
+                changeRightClickedTrack={changeRightClickedTrack}
+              />
+            ) : (
+              <div className="timelineSettingsHiddenTracksSpacer" />
+            )}
             <TimelineRuler
               zeroAt={zeroAt}
               rangeStart={committedRange.start}
@@ -192,7 +196,7 @@ class FullTimelineImpl extends React.PureComponent<Props, State> {
             </Reorderable>
           </OverflowEdgeIndicator>
         </TimelineSelection>
-        <TimelineTrackContextMenu />
+        {hiddenTrackCount.total > 1 ? <TimelineTrackContextMenu /> : null}
       </>
     );
   }
diff --git a/src/components/timeline/GlobalTrack.tsx b/src/components/timeline/GlobalTrack.tsx
index e560a1433d..a8046f1368 100644
--- a/src/components/timeline/GlobalTrack.tsx
+++ b/src/components/timeline/GlobalTrack.tsx
@@ -70,6 +70,7 @@ type StateProps = {
   readonly selectedTab: TabSlug;
   readonly processesWithMemoryTrack: Set<Pid>;
   readonly progressGraphData: ProgressGraphData[] | null;
+  readonly totalTrackCount: number;
 };
 
 type DispatchProps = {
@@ -243,6 +244,7 @@ class GlobalTrackComponent extends PureComponent<Props> {
       localTracks,
       pid,
       globalTrack,
+      totalTrackCount,
     } = this.props;
 
     if (isHidden) {
@@ -290,17 +292,19 @@ class GlobalTrackComponent extends PureComponent<Props> {
                 </div>
               ) : null}
             </button>
-            <Localized
-              id="TrackNameButton--hide-process"
-              attrs={{ title: true }}
-            >
-              <button
-                type="button"
-                className="timelineTrackCloseButton"
-                title="Hide process"
-                onClick={this._hideCurrentTrack}
-              />
-            </Localized>
+            {totalTrackCount > 1 ? (
+              <Localized
+                id="TrackNameButton--hide-process"
+                attrs={{ title: true }}
+              >
+                <button
+                  type="button"
+                  className="timelineTrackCloseButton"
+                  title="Hide process"
+                  onClick={this._hideCurrentTrack}
+                />
+              </Localized>
+            ) : null}
           </div>
           <div
             className="timelineTrackTrack"
@@ -388,6 +392,7 @@ export const TimelineGlobalTrack = explicitConnect<
       selectedTab,
       processesWithMemoryTrack: getProcessesWithMemoryTrack(state),
       progressGraphData,
+      totalTrackCount: globalTracks.length,
     };
   },
   mapDispatchToProps: {
diff --git a/src/components/timeline/index.css b/src/components/timeline/index.css
index 97d49fb5a7..17a4f3dbc3 100644
--- a/src/components/timeline/index.css
+++ b/src/components/timeline/index.css
@@ -31,17 +31,22 @@
   list-style: none;
 }
 
+.timelineSettingsHiddenTracks,
+.timelineSettingsHiddenTracksSpacer {
+  width: var(--thread-label-column-width);
+  box-sizing: border-box;
+
+  /* Separator line between tracks menu button and timeline ruler */
+  border-right: 1px solid var(--grey-30);
+}
+
 .timelineSettingsHiddenTracks {
   /* Make sure and override all rules that have to do with button defaults. */
   position: relative;
-  width: var(--thread-label-column-width);
 
   /* 8px is intentional to align this text with the text above. */
   padding: 0 20px 0 8px;
   border: 0;
-
-  /* Separator line between tracks menu button and timeline ruler */
-  border-right: 1px solid var(--grey-30);
   background: none;
   color: inherit;
   font: inherit;
diff --git a/src/test/components/__snapshots__/GlobalTrack.test.tsx.snap b/src/test/components/__snapshots__/GlobalTrack.test.tsx.snap
index aec00c6cf8..76a77cfc01 100644
--- a/src/test/components/__snapshots__/GlobalTrack.test.tsx.snap
+++ b/src/test/components/__snapshots__/GlobalTrack.test.tsx.snap
@@ -589,11 +589,6 @@ exports[`timeline/GlobalTrack will not render markers to the timeline-overview w
       >
         Process 0
       </button>
-      <button
-        class="timelineTrackCloseButton"
-        title="Hide process"
-        type="button"
-      />
     </div>
     <div
       class="timelineTrackTrack"
@@ -2140,11 +2135,6 @@ exports[`timeline/GlobalTrack will render markers with a timeline-overview schem
       >
         Process 0
       </button>
-      <button
-        class="timelineTrackCloseButton"
-        title="Hide process"
-        type="button"
-      />
     </div>
     <div
       class="timelineTrackTrack"
diff --git a/src/test/components/__snapshots__/Timeline.test.tsx.snap b/src/test/components/__snapshots__/Timeline.test.tsx.snap
index ee9ad638c6..4c3ac88f95 100644
--- a/src/test/components/__snapshots__/Timeline.test.tsx.snap
+++ b/src/test/components/__snapshots__/Timeline.test.tsx.snap
@@ -74,11 +74,6 @@ exports[`TimelineSelection does not crash when there are no samples or markers 1
                     >
                       Process 0
                     </button>
-                    <button
-                      class="timelineTrackCloseButton"
-                      title="Hide process"
-                      type="button"
-                    />
                   </div>
                   <div
                     class="timelineTrackTrack"
@@ -408,11 +403,6 @@ exports[`TimelineSelection renders the vertical line indicating the time positio
                     >
                       Process 0
                     </button>
-                    <button
-                      class="timelineTrackCloseButton"
-                      title="Hide process"
-                      type="button"
-                    />
                   </div>
                   <div
                     class="timelineTrackTrack"