diff --git a/src/lib/components/search-attribute-filter/filter-bar.svelte b/src/lib/components/search-attribute-filter/filter-bar.svelte
index 58a219142b..f1ca23e8f5 100644
--- a/src/lib/components/search-attribute-filter/filter-bar.svelte
+++ b/src/lib/components/search-attribute-filter/filter-bar.svelte
@@ -28,7 +28,7 @@
     options,
     searchAttributes,
     id,
-    statusAttribute,
+    statusAttribute = 'ExecutionStatus',
     onManualSearch,
     includeNullConditions,
   }: Props = $props();
diff --git a/src/lib/components/standalone-activities/activities-summary-filter-bar/filter-bar.svelte b/src/lib/components/standalone-activities/activities-summary-filter-bar/filter-bar.svelte
index 350c7c2dea..d6bfc64ed3 100644
--- a/src/lib/components/standalone-activities/activities-summary-filter-bar/filter-bar.svelte
+++ b/src/lib/components/standalone-activities/activities-summary-filter-bar/filter-bar.svelte
@@ -17,6 +17,5 @@
   options={$activitySearchAttributeOptions}
   searchAttributes={$activitySearchAttributes}
   id="activity"
-  statusAttribute="ExecutionStatus"
   {onManualSearch}
 />
diff --git a/src/lib/components/workflow/filter-bar/dropdown-filter-list.svelte b/src/lib/components/workflow/filter-bar/dropdown-filter-list.svelte
deleted file mode 100644
index c4128ce8f7..0000000000
--- a/src/lib/components/workflow/filter-bar/dropdown-filter-list.svelte
+++ /dev/null
@@ -1,115 +0,0 @@
-<script lang="ts">
-  import { getContext } from 'svelte';
-
-  import { page } from '$app/state';
-
-  import DropdownFilterChip from '$lib/components/search-attribute-filter/dropdown-filter-chip.svelte';
-  import Button from '$lib/holocene/button.svelte';
-  import { translate } from '$lib/i18n/translate';
-  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
-  import { workflowFilters } from '$lib/stores/filters';
-  import { isStatusFilter } from '$lib/utilities/query/search-attribute-filter';
-  import { createFilter } from '$lib/utilities/query/to-list-workflow-filters';
-  import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
-
-  import { FILTER_CONTEXT, type FilterContext } from './filter.svelte';
-  import StatusDropdownFilterChip from './status-dropdown-filter-chip.svelte';
-
-  const { filter, activeQueryIndex, chipOpenIndex } =
-    getContext<FilterContext>(FILTER_CONTEXT);
-
-  let totalFiltersInView = $state(10);
-
-  const firstExecutionStatusIndex = $derived(
-    $workflowFilters.findIndex((filter) => isStatusFilter(filter)),
-  );
-  const visibleFilters = $derived(
-    $workflowFilters.slice(0, totalFiltersInView),
-  );
-  const executionStatusFilters = $derived(
-    $workflowFilters.filter((filter) => filter.attribute === 'ExecutionStatus'),
-  );
-  const nonStatusFilters = $derived(
-    $workflowFilters.filter((filter) => !isStatusFilter(filter)),
-  );
-  const hasMoreFilters = $derived(totalFiltersInView < $workflowFilters.length);
-
-  function updateFilter(index: number, updatedFilter: SearchAttributeFilter) {
-    const next = [...$workflowFilters];
-    next[index] = updatedFilter;
-    $workflowFilters = next;
-    updateQueryParamsFromFilter(page.url, $workflowFilters);
-    $chipOpenIndex = null;
-  }
-
-  function updateStatusFilters(
-    index: number,
-    updatedFilters: SearchAttributeFilter[],
-  ) {
-    if (updatedFilters.length === 0) {
-      $workflowFilters = nonStatusFilters;
-      updateQueryParamsFromFilter(page.url, $workflowFilters);
-    } else {
-      const next = [...$workflowFilters];
-      next.splice(index, executionStatusFilters.length, ...updatedFilters);
-      $workflowFilters = next;
-      updateQueryParamsFromFilter(page.url, $workflowFilters);
-    }
-  }
-
-  function removeFilter(index: number) {
-    const next = [...$workflowFilters];
-    next.splice(index, 1);
-    $workflowFilters = next;
-    updateQueryParamsFromFilter(page.url, $workflowFilters);
-
-    if (index === $workflowFilters.length && $workflowFilters.length > 0) {
-      const previousQuery = $workflowFilters[$workflowFilters.length - 1];
-      if (previousQuery) {
-        previousQuery.operator = '';
-      }
-    }
-
-    if (index === $activeQueryIndex) {
-      $activeQueryIndex = null;
-      $filter = createFilter();
-    } else if (index < $activeQueryIndex) {
-      $activeQueryIndex -= 1;
-    }
-  }
-
-  function viewMoreFilters() {
-    if (hasMoreFilters) {
-      totalFiltersInView += 10;
-    }
-  }
-</script>
-
-{#if visibleFilters.length > 0}
-  <div class="flex flex-wrap items-center gap-2">
-    {#each visibleFilters as workflowFilter, i (workflowFilter.id)}
-      {#if isStatusFilter(workflowFilter) && i === firstExecutionStatusIndex}
-        <StatusDropdownFilterChip
-          filters={executionStatusFilters}
-          index={i}
-          openIndex={$chipOpenIndex}
-          onUpdate={(statusFilters) => updateStatusFilters(i, statusFilters)}
-        />
-      {:else if !isStatusFilter(workflowFilter) && workflowFilter.attribute}
-        <DropdownFilterChip
-          filter={workflowFilter}
-          index={i}
-          openIndex={$chipOpenIndex}
-          onUpdate={(updatedFilter) => updateFilter(i, updatedFilter)}
-          onRemove={() => removeFilter(i)}
-        />
-      {/if}
-    {/each}
-
-    {#if hasMoreFilters}
-      <Button variant="secondary" size="xs" on:click={viewMoreFilters}>
-        {translate('common.view-more')}
-      </Button>
-    {/if}
-  </div>
-{/if}
diff --git a/src/lib/components/workflow/filter-bar/filter.svelte b/src/lib/components/workflow/filter-bar/filter.svelte
deleted file mode 100644
index 884408a140..0000000000
--- a/src/lib/components/workflow/filter-bar/filter.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<script lang="ts" module>
-  import { writable, type Writable } from 'svelte/store';
-
-  import { setContext } from 'svelte';
-
-  export const FILTER_CONTEXT = 'filter-context';
-
-  export interface FilterContext {
-    filter: Writable<SearchAttributeFilter>;
-    activeQueryIndex: Writable<number>;
-    handleSubmit: () => void;
-    focusedElementId: Writable<string>;
-    resetFilter: () => void;
-    chipOpenIndex: Writable<number>;
-  }
-</script>
-
-<script lang="ts">
-  import { afterNavigate } from '$app/navigation';
-
-  import DropdownFilterList from '$lib/components/workflow/filter-bar/dropdown-filter-list.svelte';
-  import SearchAttributeMenu from '$lib/components/workflow/filter-bar/search-attribute-menu.svelte';
-  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
-  import { workflowFilters } from '$lib/stores/filters';
-  import { sortedSearchAttributeOptions } from '$lib/stores/search-attributes';
-  import { createFilter } from '$lib/utilities/query/to-list-workflow-filters';
-
-  const filter = writable<SearchAttributeFilter>(createFilter());
-  const activeQueryIndex = writable<number>(null);
-  const focusedElementId = writable<string>('');
-  const chipOpenIndex = writable<number>(null);
-
-  const options = $derived($sortedSearchAttributeOptions);
-
-  afterNavigate(() => {
-    chipOpenIndex.set(null);
-  });
-
-  setContext<FilterContext>(FILTER_CONTEXT, {
-    filter,
-    activeQueryIndex,
-    handleSubmit,
-    focusedElementId,
-    resetFilter,
-    chipOpenIndex,
-  });
-
-  function handleSubmit() {
-    if ($activeQueryIndex !== null) {
-      $workflowFilters[$activeQueryIndex] = $filter;
-      $activeQueryIndex = null;
-    } else {
-      const newIndex = $workflowFilters.length;
-      $workflowFilters = [...$workflowFilters, $filter];
-      chipOpenIndex.set(newIndex);
-    }
-    filter.set(createFilter());
-  }
-
-  function resetFilter() {
-    activeQueryIndex.set(null);
-    filter.set(createFilter());
-  }
-</script>
-
-<div class="flex shrink flex-wrap items-center justify-start gap-2">
-  <DropdownFilterList />
-  <SearchAttributeMenu {options} />
-</div>
diff --git a/src/lib/components/workflow/filter-bar/index.svelte b/src/lib/components/workflow/filter-bar/index.svelte
index 26387a76f2..0b00c7a614 100644
--- a/src/lib/components/workflow/filter-bar/index.svelte
+++ b/src/lib/components/workflow/filter-bar/index.svelte
@@ -1,40 +1,21 @@
 <script lang="ts">
-  import Button from '$lib/holocene/button.svelte';
-  import Icon from '$lib/holocene/icon/icon.svelte';
-  import Tooltip from '$lib/holocene/tooltip.svelte';
+  import FilterBar from '$lib/components/search-attribute-filter/filter-bar.svelte';
+  import { workflowFilters } from '$lib/stores/filters';
+  import {
+    searchAttributes,
+    sortedSearchAttributeOptions,
+  } from '$lib/stores/search-attributes';
+  import { refresh } from '$lib/stores/workflows';
 
-  import Filter from './filter.svelte';
-  import ManualQuery from './manual-query.svelte';
-
-  let viewManualQuery = $state(false);
+  const onManualSearch = () => {
+    $refresh = Date.now();
+  };
 </script>
 
-{#snippet actionToggleButtons()}
-  <div class="flex items-center gap-1">
-    <Tooltip text={viewManualQuery ? 'Hide raw query' : 'View raw query'} left>
-      <Button
-        variant="ghost"
-        size="xs"
-        leadingIcon="json"
-        active={viewManualQuery}
-        data-testid="toggle-manual-query"
-        on:click={() => (viewManualQuery = !viewManualQuery)}
-      />
-    </Tooltip>
-  </div>
-{/snippet}
-
-<div>
-  <div
-    class="flex w-full flex-wrap items-center justify-between gap-2 border border-subtle bg-primary p-1.5"
-  >
-    <div class="flex grow items-center justify-start gap-4 px-2">
-      <Icon name="filter-lines" class="text-primary-text h-4 w-4 shrink-0" />
-      <Filter />
-    </div>
-    {@render actionToggleButtons()}
-  </div>
-  {#if viewManualQuery}
-    <ManualQuery />
-  {/if}
-</div>
+<FilterBar
+  filters={workflowFilters}
+  options={$sortedSearchAttributeOptions}
+  searchAttributes={$searchAttributes}
+  id="workflow"
+  {onManualSearch}
+/>
diff --git a/src/lib/components/workflow/filter-bar/manual-query.svelte b/src/lib/components/workflow/filter-bar/manual-query.svelte
deleted file mode 100644
index c68098c2b3..0000000000
--- a/src/lib/components/workflow/filter-bar/manual-query.svelte
+++ /dev/null
@@ -1,87 +0,0 @@
-<script lang="ts">
-  import { fade, slide } from 'svelte/transition';
-
-  import { page } from '$app/state';
-
-  import Button from '$lib/holocene/button.svelte';
-  import Input from '$lib/holocene/input/input.svelte';
-  import { translate } from '$lib/i18n/translate';
-  import { workflowFilters } from '$lib/stores/filters';
-  import { currentPageKey } from '$lib/stores/pagination';
-  import { searchAttributes } from '$lib/stores/search-attributes';
-  import { refresh, workflowsQuery } from '$lib/stores/workflows';
-  import { toListWorkflowFilters } from '$lib/utilities/query/to-list-workflow-filters';
-  import { MAX_QUERY_LENGTH } from '$lib/utilities/request-from-api';
-  import { updateQueryParameters } from '$lib/utilities/update-query-parameters';
-
-  let manualSearchString = $state('');
-
-  const query = $derived(page.url.searchParams.get('query'));
-
-  function setManualString(query: string) {
-    manualSearchString = query;
-  }
-
-  $effect(() => {
-    setManualString(query);
-  });
-
-  const onSearch = () => {
-    if (!manualSearchString) {
-      $workflowFilters = [];
-      $workflowsQuery = '';
-    } else {
-      try {
-        $workflowFilters = toListWorkflowFilters(
-          manualSearchString,
-          $searchAttributes,
-        );
-      } catch (e) {
-        console.error(e);
-      }
-    }
-
-    if (manualSearchString && manualSearchString === query) {
-      $refresh = Date.now();
-    } else {
-      updateQueryParameters({
-        url: page.url,
-        parameter: 'query',
-        value: manualSearchString,
-        allowEmpty: true,
-        clearParameters: [currentPageKey],
-      });
-    }
-  };
-
-  function handleClearInput() {
-    onSearch();
-  }
-</script>
-
-<div class="w-full border border-t-0 border-subtle" in:fade>
-  <form onsubmit={onSearch} class="flex gap-0" transition:slide role="search">
-    <Input
-      id="query"
-      type="search"
-      label={translate('workflows.search-placeholder')}
-      labelHidden
-      placeholder={translate('workflows.search-placeholder')}
-      icon="search"
-      class="grow  [&_*]:border-0"
-      inputContainerClass="surface-information !border-r border-subtle"
-      clearable
-      copyButtonLabel={translate('common.copy-icon-title')}
-      clearButtonLabel={translate('common.clear-input-button-label')}
-      on:clear={handleClearInput}
-      bind:value={manualSearchString}
-      maxLength={MAX_QUERY_LENGTH}
-      hideCount={!manualSearchString ||
-        manualSearchString.length < MAX_QUERY_LENGTH}
-      data-testid="manual-search-input"
-    />
-    <Button data-testid="manual-search-button" variant="ghost" type="submit">
-      {translate('common.search')}
-    </Button>
-  </form>
-</div>
diff --git a/src/lib/components/workflow/filter-bar/search-attribute-menu.svelte b/src/lib/components/workflow/filter-bar/search-attribute-menu.svelte
deleted file mode 100644
index bce1021768..0000000000
--- a/src/lib/components/workflow/filter-bar/search-attribute-menu.svelte
+++ /dev/null
@@ -1,158 +0,0 @@
-<script lang="ts">
-  import { writable } from 'svelte/store';
-
-  import { getContext } from 'svelte';
-
-  import { page } from '$app/state';
-
-  import Button from '$lib/holocene/button.svelte';
-  import Input from '$lib/holocene/input/input.svelte';
-  import {
-    Menu,
-    MenuButton,
-    MenuContainer,
-    MenuItem,
-  } from '$lib/holocene/menu';
-  import { translate } from '$lib/i18n/translate';
-  import { workflowFilters } from '$lib/stores/filters';
-  import type { SearchAttributeOption } from '$lib/stores/search-attributes';
-  import {
-    SEARCH_ATTRIBUTE_TYPE,
-    type SearchAttributeType,
-  } from '$lib/types/workflows';
-  import { isStatusFilter } from '$lib/utilities/query/search-attribute-filter';
-  import {
-    createFilter,
-    updateQueryParamsFromFilter,
-  } from '$lib/utilities/query/to-list-workflow-filters';
-  import { MAX_QUERY_LENGTH } from '$lib/utilities/request-from-api';
-
-  import { FILTER_CONTEXT, type FilterContext } from './filter.svelte';
-
-  let { options }: { options: SearchAttributeOption[] } = $props();
-
-  const query = $derived(page.url.searchParams.get('query'));
-  let searchAttributeValue = $state('');
-
-  const { filter, activeQueryIndex, handleSubmit } =
-    getContext<FilterContext>(FILTER_CONTEXT);
-
-  const open = writable(false);
-
-  const getDefaultConditional = (type: SearchAttributeType) => {
-    switch (type) {
-      case SEARCH_ATTRIBUTE_TYPE.BOOL:
-        return '=';
-      case SEARCH_ATTRIBUTE_TYPE.DATETIME:
-        return '>=';
-      case SEARCH_ATTRIBUTE_TYPE.INT:
-        return '=';
-      case SEARCH_ATTRIBUTE_TYPE.DOUBLE:
-        return '=';
-      case SEARCH_ATTRIBUTE_TYPE.KEYWORDLIST:
-        return 'in';
-      case SEARCH_ATTRIBUTE_TYPE.KEYWORD:
-        return '=';
-      case SEARCH_ATTRIBUTE_TYPE.TEXT:
-        return '=';
-      default:
-        return '=';
-    }
-  };
-
-  function handleNewQuery(value: string, type: SearchAttributeType) {
-    searchAttributeValue = '';
-    filter.set(
-      createFilter({
-        attribute: value,
-        conditional: getDefaultConditional(type),
-        type,
-      }),
-    );
-    handleSubmit();
-    $open = false;
-  }
-
-  const filteredOptions = $derived(
-    !searchAttributeValue
-      ? options
-      : options.filter((option) =>
-          option.value
-            .toLowerCase()
-            .includes(searchAttributeValue.toLowerCase()),
-        ),
-  );
-
-  function clearAllFilters() {
-    $workflowFilters = [];
-    updateQueryParamsFromFilter(page.url, $workflowFilters, true);
-    $activeQueryIndex = null;
-    $filter = createFilter();
-  }
-</script>
-
-<MenuContainer {open}>
-  <MenuButton
-    id="search-attribute-filter-button"
-    controls="search-attribute-menu"
-    leadingIcon="add"
-    variant="secondary"
-    data-testid="add-filter-button"
-    disabled={$activeQueryIndex !== null || query?.length >= MAX_QUERY_LENGTH}
-    onclick={() => (searchAttributeValue = '')}
-    class="text-nowrap"
-    size="xs"
-  >
-    Add Filter
-  </MenuButton>
-  <Menu id="search-attribute-menu">
-    <MenuItem
-      class="p-0"
-      hoverable={false}
-      onclick={() => {
-        document.getElementById('filter-search')?.focus();
-      }}
-    >
-      <Input
-        label={translate('common.search')}
-        labelHidden
-        id="filter-search"
-        noBorder
-        bind:value={searchAttributeValue}
-        icon="search"
-        placeholder={translate('common.search')}
-        class="w-full min-w-[300px]"
-      />
-    </MenuItem>
-    <hr class="border-subtle" />
-
-    {#each filteredOptions as { value, label, type }}
-      <MenuItem
-        onclick={() => {
-          handleNewQuery(value, type);
-        }}
-        disabled={value === 'ExecutionStatus' &&
-          !!$workflowFilters.find((f) => isStatusFilter(f))}
-      >
-        <div>
-          <p class="leading-3">{label}</p>
-          <small class="text-secondary">{type}</small>
-        </div>
-      </MenuItem>
-    {:else}
-      <MenuItem class="whitespace-nowrap" disabled
-        >{translate('common.no-results')}</MenuItem
-      >
-    {/each}
-  </Menu>
-</MenuContainer>
-{#if $workflowFilters.length > 0}
-  <Button
-    variant="ghost"
-    size="xs"
-    on:click={clearAllFilters}
-    data-testid="clear-all-filters-button"
-  >
-    {translate('common.clear-all')}
-  </Button>
-{/if}
diff --git a/src/lib/components/workflow/filter-bar/status-dropdown-filter-chip.svelte b/src/lib/components/workflow/filter-bar/status-dropdown-filter-chip.svelte
deleted file mode 100644
index 766979dacf..0000000000
--- a/src/lib/components/workflow/filter-bar/status-dropdown-filter-chip.svelte
+++ /dev/null
@@ -1,123 +0,0 @@
-<script lang="ts">
-  import { writable } from 'svelte/store';
-
-  import WorkflowStatus from '$lib/components/workflow-status.svelte';
-  import Checkbox from '$lib/holocene/checkbox.svelte';
-  import { Menu, MenuButton, MenuContainer } from '$lib/holocene/menu';
-  import MenuItem from '$lib/holocene/menu/menu-item.svelte';
-  import Translate from '$lib/i18n/translate.svelte';
-  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
-  import { workflowStatusFilters } from '$lib/models/workflow-status';
-  import { createFilter } from '$lib/utilities/query/to-list-workflow-filters';
-
-  type Props = {
-    filters: SearchAttributeFilter[];
-    onUpdate: (updatedFilter: SearchAttributeFilter[]) => void;
-    index?: number;
-    openIndex?: number;
-  };
-
-  let { filters, onUpdate, index = 0, openIndex = undefined }: Props = $props();
-
-  const open = writable(false);
-  let localFilters = $state([...filters]);
-
-  const controlsId = $derived('dropdown-filter-chip-execution-status');
-
-  function handleStatusSelect(status: string | null) {
-    if (localFilters.find((f) => f.value === status)) {
-      localFilters = localFilters.filter((f) => f.value !== status);
-      onUpdate(localFilters);
-      return;
-    }
-
-    if (status === 'All') {
-      localFilters = [];
-      onUpdate(localFilters);
-      return;
-    }
-
-    if (localFilters.length === 1 && localFilters[0].value === '') {
-      localFilters = [
-        createFilter({
-          attribute: 'ExecutionStatus',
-          type: 'Keyword',
-          value: status ?? undefined,
-          conditional: '=',
-        }),
-      ];
-    } else {
-      localFilters = [
-        ...localFilters,
-        createFilter({
-          attribute: 'ExecutionStatus',
-          parenthesis: localFilters.length ? ')' : '',
-          type: 'Keyword',
-          value: status ?? undefined,
-          conditional: '=',
-        }),
-      ];
-    }
-
-    if (localFilters.length > 1) {
-      localFilters[0].parenthesis = '(';
-      localFilters[localFilters.length - 2].operator = 'OR';
-    }
-
-    onUpdate(localFilters);
-  }
-
-  $effect(() => {
-    if (openIndex === index) {
-      $open = true;
-    }
-  });
-
-  $effect(() => {
-    if (!$open) {
-      localFilters = [...filters];
-    }
-  });
-</script>
-
-<MenuContainer {open}>
-  <MenuButton size="xs" controls={controlsId} hasIndicator class="bg-secondary">
-    ExecutionStatus =<span class="pl-1 text-brand"
-      >{filters.map((f) => f.value).join(', ')}</span
-    >
-  </MenuButton>
-
-  <Menu id={controlsId} class="max-h-fit w-80 max-w-fit p-4" keepOpen>
-    <div class="space-y-2">
-      <div class="flex items-center justify-between">
-        <h3 class="text-sm font-medium">Filter by Execution Status</h3>
-      </div>
-
-      {#each workflowStatusFilters as status (status)}
-        {@const checked =
-          localFilters.some((filter) => filter.value === status) ||
-          (localFilters.length === 1 &&
-            !localFilters[0].value &&
-            status === 'All')}
-        <MenuItem
-          data-testid={`status-dropdown-filter-chip-${status}`}
-          onclick={() => handleStatusSelect(status)}
-        >
-          {#snippet leading()}
-            <Checkbox
-              on:change={() => handleStatusSelect(status)}
-              {checked}
-              label={status ?? undefined}
-              labelHidden
-            />
-          {/snippet}
-          {#if status === 'All'}
-            <Translate key="workflows.all-statuses" />
-          {:else}
-            <WorkflowStatus {status} />
-          {/if}
-        </MenuItem>
-      {/each}
-    </div>
-  </Menu>
-</MenuContainer>
diff --git a/tests/integration/saved-query-views.spec.ts b/tests/integration/saved-query-views.spec.ts
index a713b52c47..30b85c063c 100644
--- a/tests/integration/saved-query-views.spec.ts
+++ b/tests/integration/saved-query-views.spec.ts
@@ -50,8 +50,8 @@ test.describe('Saved Query Views', () => {
   test('User saved queries: create new, edit view, then delete', async ({
     page,
   }) => {
-    await page.locator('#search-attribute-filter-button').click();
-    await page.locator('#filter-search').fill('WorkflowId');
+    await page.locator('#workflow-search-attribute-filter-button').click();
+    await page.locator('#workflow-filter-search').fill('WorkflowId');
     await page.getByRole('menuitem', { name: 'WorkflowId Keyword' }).click();
     await page
       .getByTestId('dropdown-filter-chip-WorkflowId-0-text')
@@ -74,8 +74,8 @@ test.describe('Saved Query Views', () => {
       .toBe('`WorkflowId`="user-view-1"');
     await expect(page.getByTestId('my-view')).toBeVisible();
 
-    await page.locator('#search-attribute-filter-button').click();
-    await page.locator('#filter-search').fill('TaskQueue');
+    await page.locator('#workflow-search-attribute-filter-button').click();
+    await page.locator('#workflow-filter-search').fill('TaskQueue');
     await page.getByRole('menuitem', { name: 'TaskQueue Keyword' }).click();
     await page
       .getByTestId('dropdown-filter-chip-TaskQueue-1-text')
@@ -112,8 +112,8 @@ test.describe('Saved Query Views', () => {
   test('User saved queries: create new, create copied view and delete', async ({
     page,
   }) => {
-    await page.locator('#search-attribute-filter-button').click();
-    await page.locator('#filter-search').fill('WorkflowId');
+    await page.locator('#workflow-search-attribute-filter-button').click();
+    await page.locator('#workflow-filter-search').fill('WorkflowId');
     await page.getByRole('menuitem', { name: 'WorkflowId Keyword' }).click();
     await page
       .getByTestId('dropdown-filter-chip-WorkflowId-0-text')
@@ -136,8 +136,8 @@ test.describe('Saved Query Views', () => {
       .toBe('`WorkflowId`="user-view-1"');
     await expect(page.getByTestId('original-view')).toBeVisible();
 
-    await page.locator('#search-attribute-filter-button').click();
-    await page.locator('#filter-search').fill('TaskQueue');
+    await page.locator('#workflow-search-attribute-filter-button').click();
+    await page.locator('#workflow-filter-search').fill('TaskQueue');
     await page.getByRole('menuitem', { name: 'TaskQueue Keyword' }).click();
     await page
       .getByTestId('dropdown-filter-chip-TaskQueue-1-text')
diff --git a/tests/integration/workflow-bulk-actions.spec.ts b/tests/integration/workflow-bulk-actions.spec.ts
index fa76a3cff6..0f0b95b20a 100644
--- a/tests/integration/workflow-bulk-actions.spec.ts
+++ b/tests/integration/workflow-bulk-actions.spec.ts
@@ -40,12 +40,12 @@ test.describe('Batch and Bulk Workflow Actions', () => {
     test('allows running workflows to be terminated by a query', async ({
       page,
     }) => {
-      await page.locator('#search-attribute-filter-button').click();
+      await page.locator('#workflow-search-attribute-filter-button').click();
       await page.getByTestId('toggle-manual-query').click();
       await page
-        .getByTestId('manual-search-input')
+        .getByTestId('workflow-manual-search-input')
         .fill('ExecutionStatus="Running"');
-      await page.getByTestId('manual-search-button').click();
+      await page.getByTestId('workflow-manual-search-button').click();
       await page.getByTestId('batch-actions-checkbox').click();
       await page.click('[data-testid="select-all-workflows"]');
       await page.click('[data-testid="bulk-terminate-button"]');
@@ -83,12 +83,12 @@ test.describe('Batch and Bulk Workflow Actions', () => {
     test('allows running workflows to be cancelled by a query', async ({
       page,
     }) => {
-      await page.locator('#search-attribute-filter-button').click();
+      await page.locator('#workflow-search-attribute-filter-button').click();
       await page.getByTestId('toggle-manual-query').click();
       await page
-        .getByTestId('manual-search-input')
+        .getByTestId('workflow-manual-search-input')
         .fill('ExecutionStatus="Running"');
-      await page.getByTestId('manual-search-button').click();
+      await page.getByTestId('workflow-manual-search-button').click();
       await page.getByTestId('batch-actions-checkbox').click();
       await page.click('[data-testid="select-all-workflows"]');
       await page.click('[data-testid="bulk-cancel-button"]');
diff --git a/tests/integration/workflows-search-attribute-filter.desktop.spec.ts b/tests/integration/workflows-search-attribute-filter.desktop.spec.ts
index 6daf46b86c..1562dde539 100644
--- a/tests/integration/workflows-search-attribute-filter.desktop.spec.ts
+++ b/tests/integration/workflows-search-attribute-filter.desktop.spec.ts
@@ -37,10 +37,10 @@ test('it should update the datetime filter based on the selected timezone', asyn
 
   await page.getByTestId('toggle-manual-query').click();
   await page
-    .getByTestId('manual-search-input')
+    .getByTestId('workflow-manual-search-input')
     .fill('`CloseTime`>="2025-12-25T12:00:00.000Z"');
 
-  await page.getByTestId('manual-search-button').click();
+  await page.getByTestId('workflow-manual-search-button').click();
 
   await expect
     .poll(() => getQueryParam(page.url()))
@@ -54,7 +54,9 @@ test('it should update the datetime filter based on the selected timezone', asyn
 
   await page.getByTestId('toggle-manual-query').click();
 
-  let query = await page.getByTestId('manual-search-input').inputValue();
+  let query = await page
+    .getByTestId('workflow-manual-search-input')
+    .inputValue();
   expect(getDatetime(query)).toMatch(validDatetime);
 
   await page.getByTestId('timezones-menu-button').click();
@@ -72,7 +74,7 @@ test('it should update the datetime filter based on the selected timezone', asyn
 
   await page.getByTestId('toggle-manual-query').click();
 
-  query = await page.getByTestId('manual-search-input').inputValue();
+  query = await page.getByTestId('workflow-manual-search-input').inputValue();
   expect(getDatetime(query)).toMatch(validDatetime);
 });
 
diff --git a/tests/integration/workflows-search-attribute-filter.mobile.spec.ts b/tests/integration/workflows-search-attribute-filter.mobile.spec.ts
index 984e5580c1..7336c7dc57 100644
--- a/tests/integration/workflows-search-attribute-filter.mobile.spec.ts
+++ b/tests/integration/workflows-search-attribute-filter.mobile.spec.ts
@@ -51,10 +51,10 @@ test('it should update the datetime filter based on the selected timezone', asyn
 
   await page.getByTestId('toggle-manual-query').click();
   await page
-    .getByTestId('manual-search-input')
+    .getByTestId('workflow-manual-search-input')
     .fill('`CloseTime`>="2025-12-25T12:00:00.000Z"');
 
-  await page.getByTestId('manual-search-button').click();
+  await page.getByTestId('workflow-manual-search-button').click();
 
   await expect
     .poll(() => getQueryParam(page.url()))
@@ -65,7 +65,9 @@ test('it should update the datetime filter based on the selected timezone', asyn
       name: 'CloseTime >= 12/25/25, 6:00:00.00 AM CST',
     }),
   ).toBeVisible();
-  let query = await page.getByTestId('manual-search-input').inputValue();
+  let query = await page
+    .getByTestId('workflow-manual-search-input')
+    .inputValue();
   expect(getDatetime(query)).toMatch(validDatetime);
 
   await page.getByTestId('nav-profile-button').click();
@@ -86,7 +88,7 @@ test('it should update the datetime filter based on the selected timezone', asyn
 
   await page.getByTestId('nav-profile-button').click();
 
-  query = await page.getByTestId('manual-search-input').inputValue();
+  query = await page.getByTestId('workflow-manual-search-input').inputValue();
   expect(getDatetime(query)).toMatch(validDatetime);
 });