diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
index 17f3199b75b15b..d8a47c9e38dd06 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
@@ -18,19 +18,13 @@
  */
 
 import { find, template } from 'lodash';
-import { stringify } from 'query-string';
 import $ from 'jquery';
-import rison from 'rison-node';
-import '../../doc_viewer';
-
 import openRowHtml from './table_row/open.html';
 import detailsHtml from './table_row/details.html';
-
-import { dispatchRenderComplete, url } from '../../../../../../kibana_utils/public';
+import { dispatchRenderComplete } from '../../../../../../kibana_utils/public';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '../../../../../common';
 import cellTemplateHtml from '../components/table_row/cell.html';
 import truncateByHeightTemplateHtml from '../components/table_row/truncate_by_height.html';
-import { esFilters } from '../../../../../../data/public';
 import { getServices } from '../../../../kibana_services';
 
 const TAGS_WITH_WS = />\s+</g;
@@ -115,25 +109,7 @@ export function createTableRowDirective($compile: ng.ICompileService) {
       };
 
       $scope.getContextAppHref = () => {
-        const globalFilters: any = getServices().filterManager.getGlobalFilters();
-        const appFilters: any = getServices().filterManager.getAppFilters();
-
-        const hash = stringify(
-          url.encodeQuery({
-            _g: rison.encode({
-              filters: globalFilters || [],
-            }),
-            _a: rison.encode({
-              columns: $scope.columns,
-              filters: (appFilters || []).map(esFilters.disableFilter),
-            }),
-          }),
-          { encode: false, sort: false }
-        );
-
-        return `#/context/${encodeURIComponent($scope.indexPattern.id)}/${encodeURIComponent(
-          $scope.row._id
-        )}?${hash}`;
+        return getContextUrl($scope.indexPattern.id, $scope.row._id, getServices().filterManager);
       };
 
       // create a tr element that lists the value for each *column*
diff --git a/src/plugins/discover/public/application/helpers/get_context_url.test.ts b/src/plugins/discover/public/application/helpers/get_context_url.test.ts
index 9ff7e11a31247f..481ea6b1a5b4f4 100644
--- a/src/plugins/discover/public/application/helpers/get_context_url.test.ts
+++ b/src/plugins/discover/public/application/helpers/get_context_url.test.ts
@@ -19,16 +19,23 @@
 
 import { getContextUrl } from './get_context_url';
 import { FilterManager } from '../../../../data/public/query/filter_manager';
+const filterManager = ({
+  getGlobalFilters: () => [],
+  getAppFilters: () => [],
+} as unknown) as FilterManager;
 
 describe('Get context url', () => {
-  test('returns a valid context url', async () => {
-    const filterManager = ({
-      getGlobalFilters: () => [],
-      getAppFilters: () => [],
-    } as unknown) as FilterManager;
+  test('returning a valid context url', async () => {
     const url = await getContextUrl('docId', 'ipId', ['test1', 'test2'], filterManager);
     expect(url).toMatchInlineSnapshot(
       `"#/context/ipId/docId?_g=(filters:!())&_a=(columns:!(test1,test2),filters:!())"`
     );
   });
+
+  test('returning a valid context url when docId contains whitespace', async () => {
+    const url = await getContextUrl('doc Id', 'ipId', ['test1', 'test2'], filterManager);
+    expect(url).toMatchInlineSnapshot(
+      `"#/context/ipId/doc%20Id?_g=(filters:!())&_a=(columns:!(test1,test2),filters:!())"`
+    );
+  });
 });