diff --git a/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx b/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
index 30d4bb34ea345..c453de709a5d2 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
@@ -19,6 +19,6 @@ test('MLLink produces the correct URL', async () => {
   );
 
   expect(href).toMatchInlineSnapshot(
-    `"/app/ml/jobs?_a=(queryText:'id:(something)%20groups:(apm)')&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
+    `"/app/ml/jobs?_a=(jobs:(queryText:'id:(something)%20groups:(apm)'))&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
   );
 });
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
index 67265611c1473..df50f53b811fa 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
@@ -10,6 +10,7 @@ import { NavigationMenu } from '../../components/navigation_menu';
 import { JobsListView } from './components/jobs_list_view/index';
 import { usePageUrlState } from '../../util/url_state';
 import { ML_PAGES } from '../../../../common/constants/ml_url_generator';
+import { ListingPageUrlState } from '../../../../common/types/common';
 
 interface JobsPageProps {
   blockRefresh?: boolean;
@@ -18,15 +19,7 @@ interface JobsPageProps {
   lastRefresh?: number;
 }
 
-export interface AnomalyDetectionJobsListState {
-  pageSize: number;
-  pageIndex: number;
-  sortField: string;
-  sortDirection: string;
-  queryText?: string;
-}
-
-export const getDefaultAnomalyDetectionJobsListState = (): AnomalyDetectionJobsListState => ({
+export const getDefaultAnomalyDetectionJobsListState = (): ListingPageUrlState => ({
   pageIndex: 0,
   pageSize: 10,
   sortField: 'id',
diff --git a/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts b/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
index 717d293ccd7fa..6d7e286a29476 100644
--- a/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
+++ b/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
@@ -19,8 +19,8 @@ import type {
 import { ML_PAGES } from '../../common/constants/ml_url_generator';
 import { createGenericMlUrl } from './common';
 import { setStateToKbnUrl } from '../../../../../src/plugins/kibana_utils/public';
-import type { AnomalyDetectionJobsListState } from '../application/jobs/jobs_list/jobs';
 import { getGroupQueryText, getJobQueryText } from '../../common/util/string_utils';
+import { AppPageState, ListingPageUrlState } from '../../common/types/common';
 /**
  * Creates URL to the Anomaly Detection Job management page
  */
@@ -41,11 +41,15 @@ export function createAnomalyDetectionJobManagementUrl(
     if (groupIds) {
       queryTextArr.push(getGroupQueryText(groupIds));
     }
-    const queryState: Partial<AnomalyDetectionJobsListState> = {
+    const jobsListState: Partial<ListingPageUrlState> = {
       ...(queryTextArr.length > 0 ? { queryText: queryTextArr.join(' ') } : {}),
     };
 
-    url = setStateToKbnUrl<Partial<AnomalyDetectionJobsListState>>(
+    const queryState: AppPageState<ListingPageUrlState> = {
+      [ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE]: jobsListState,
+    };
+
+    url = setStateToKbnUrl<AppPageState<ListingPageUrlState>>(
       '_a',
       queryState,
       { useHash: false, storeInHashQuery: false },
diff --git a/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
index c80bae6f5c42a..3f3d88f1a31d9 100644
--- a/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
+++ b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
@@ -30,7 +30,7 @@ describe('MlUrlGenerator', () => {
             jobId: 'fq_single_1',
           },
         });
-        expect(url).toBe("/app/ml/jobs?_a=(queryText:'id:fq_single_1')");
+        expect(url).toBe("/app/ml/jobs?_a=(jobs:(queryText:'id:fq_single_1'))");
       });
 
       it('should generate valid URL for the Anomaly Detection job management page for groupIds', async () => {
@@ -40,7 +40,9 @@ describe('MlUrlGenerator', () => {
             groupIds: ['farequote', 'categorization'],
           },
         });
-        expect(url).toBe("/app/ml/jobs?_a=(queryText:'groups:(farequote%20or%20categorization)')");
+        expect(url).toBe(
+          "/app/ml/jobs?_a=(jobs:(queryText:'groups:(farequote%20or%20categorization)'))"
+        );
       });
 
       it('should generate valid URL for the page for selecting the type of anomaly detection job to create', async () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx
index b0965f8708558..90ab5c2f888fe 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx
@@ -55,7 +55,9 @@ describe('JobsTableComponent', () => {
       '[data-test-subj="jobs-table-link"]'
     );
     await waitFor(() =>
-      expect(href).toEqual('/app/ml/jobs?_a=(queryText:linux_anomalous_network_activity_ecs)')
+      expect(href).toEqual(
+        "/app/ml/jobs?_a=(jobs:(queryText:'id:linux_anomalous_network_activity_ecs'))"
+      )
     );
   });
 
@@ -72,7 +74,7 @@ describe('JobsTableComponent', () => {
       '[data-test-subj="jobs-table-link"]'
     );
     await waitFor(() =>
-      expect(href).toEqual("/app/ml/jobs?_a=(queryText:'job%20id%20with%20spaces')")
+      expect(href).toEqual("/app/ml/jobs?_a=(jobs:(queryText:'id:job%20id%20with%20spaces'))")
     );
   });