diff --git a/src/timeMachine/components/QueryTab.tsx b/src/timeMachine/components/QueryTab.tsx
index d2cdb01ed2..11aa407f23 100644
--- a/src/timeMachine/components/QueryTab.tsx
+++ b/src/timeMachine/components/QueryTab.tsx
@@ -144,7 +144,8 @@ class TimeMachineQueryTab extends PureComponent<Props, State> {
 
   private get showHideButton(): JSX.Element {
     const {query} = this.props
-    if (this.state.isEditingName || !this.isRemovable) {
+
+    if (this.state.isEditingName || (!this.isRemovable && !query?.hidden)) {
       return null
     }