diff --git a/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx b/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
index dbc1df966..dd8c84c36 100644
--- a/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
+++ b/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiButton, EuiSpacer, EuiLink } from '@elastic/eui';
+import { EuiButton, EuiSpacer, EuiLink, EuiIcon } from '@elastic/eui';
 import React from 'react';
 import { ContentPanel } from '../../../../components/ContentPanel';
 import { createTextDetailsGroup, parseSchedule } from '../../../../utils/helpers';
@@ -39,18 +39,18 @@ export const DetectorBasicDetailsView: React.FC<DetectorBasicDetailsViewProps> =
     { label: 'Detector name', content: name },
     { label: 'Log type', content: detector_type.toLowerCase() },
     { label: 'Data source', content: inputs[0].detector_input.indices[0] },
-  ];
-
-  if (dashboardId) {
-    firstTextDetailsGroupEntries.push({
+    {
       label: 'Detector dashboard',
-      content: (
-        <EuiLink onClick={() => window.open(`dashboards#/view/${dashboardId}`, '_self')}>
-          {}
+      content: (dashboardId ? (
+        <EuiLink onClick={() => window.open(`dashboards#/view/${dashboardId}`, '_blank')}>
+          {`${name} summary`}
+          <EuiIcon type={'popout'} />
         </EuiLink>
-      ) as any,
-    });
-  }
+      ) : (
+        'Not available for this log type'
+      )) as any,
+    },
+  ];
 
   return (
     <ContentPanel
diff --git a/public/pages/Detectors/components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap b/public/pages/Detectors/components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap
index 33b749047..84a8d02af 100644
--- a/public/pages/Detectors/components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap
+++ b/public/pages/Detectors/components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap
@@ -179,6 +179,45 @@ Object {
                 </div>
               </div>
             </div>
+            <div
+              class="euiFlexItem euiFlexItem--flexGrowZero"
+              style="min-width: 25%;"
+            >
+              <div
+                class="euiFormRow"
+                id="some_html_id-row"
+              >
+                <div
+                  class="euiFormRow__labelWrapper"
+                >
+                  <label
+                    class="euiFormLabel euiFormRow__label"
+                    for="some_html_id"
+                  >
+                    <div
+                      class="euiText euiText--medium"
+                    >
+                      <div
+                        class="euiTextColor euiTextColor--subdued"
+                      >
+                        Detector dashboard
+                      </div>
+                    </div>
+                  </label>
+                </div>
+                <div
+                  class="euiFormRow__fieldWrapper"
+                >
+                  <div
+                    class="euiText euiText--medium"
+                    data-test-subj="text-details-group-content-detector-dashboard"
+                    id="some_html_id"
+                  >
+                    Not available for this log type
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
           <div
             class="euiSpacer euiSpacer--xl"
@@ -525,6 +564,45 @@ Object {
               </div>
             </div>
           </div>
+          <div
+            class="euiFlexItem euiFlexItem--flexGrowZero"
+            style="min-width: 25%;"
+          >
+            <div
+              class="euiFormRow"
+              id="some_html_id-row"
+            >
+              <div
+                class="euiFormRow__labelWrapper"
+              >
+                <label
+                  class="euiFormLabel euiFormRow__label"
+                  for="some_html_id"
+                >
+                  <div
+                    class="euiText euiText--medium"
+                  >
+                    <div
+                      class="euiTextColor euiTextColor--subdued"
+                    >
+                      Detector dashboard
+                    </div>
+                  </div>
+                </label>
+              </div>
+              <div
+                class="euiFormRow__fieldWrapper"
+              >
+                <div
+                  class="euiText euiText--medium"
+                  data-test-subj="text-details-group-content-detector-dashboard"
+                  id="some_html_id"
+                >
+                  Not available for this log type
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
         <div
           class="euiSpacer euiSpacer--xl"
diff --git a/public/pages/Detectors/containers/Detector/DetectorDetails.tsx b/public/pages/Detectors/containers/Detector/DetectorDetails.tsx
index b38b365b1..c6810211f 100644
--- a/public/pages/Detectors/containers/Detector/DetectorDetails.tsx
+++ b/public/pages/Detectors/containers/Detector/DetectorDetails.tsx
@@ -9,6 +9,7 @@ import {
   EuiContextMenuPanel,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiHorizontalRule,
   EuiPopover,
   EuiSpacer,
   EuiTab,
@@ -19,7 +20,12 @@ import {
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { CoreServicesContext } from '../../../../components/core_services';
-import { BREADCRUMBS, EMPTY_DEFAULT_DETECTOR_HIT, ROUTES } from '../../../../utils/constants';
+import {
+  BREADCRUMBS,
+  EMPTY_DEFAULT_DETECTOR_HIT,
+  pendingDashboardCreations,
+  ROUTES,
+} from '../../../../utils/constants';
 import { DetectorHit } from '../../../../../server/models/interfaces';
 import { DetectorDetailsView } from '../DetectorDetailsView/DetectorDetailsView';
 import { FieldMappingsView } from '../../components/FieldMappingsView/FieldMappingsView';
@@ -28,7 +34,7 @@ import { RuleItem } from '../../../CreateDetector/components/DefineDetector/comp
 import { DetectorsService } from '../../../../services';
 import { errorNotificationToast } from '../../../../utils/helpers';
 import { NotificationsStart, SimpleSavedObject } from 'opensearch-dashboards/public';
-import { ServerResponse } from '../../../../../types';
+import { ISavedObjectsService, ServerResponse } from '../../../../../types';
 
 export interface DetectorDetailsProps
   extends RouteComponentProps<
@@ -43,6 +49,7 @@ export interface DetectorDetailsProps
   > {
   detectorService: DetectorsService;
   notifications: NotificationsStart;
+  savedObjectsService: ISavedObjectsService;
 }
 
 export interface DetectorDetailsState {
@@ -156,13 +163,39 @@ export class DetectorDetails extends React.Component<DetectorDetailsProps, Detec
       tabs: [],
       loading: false,
     };
-    this.props.location.state.createDashboardPromise?.then((savedObject) => {
-      if (savedObject && savedObject.ok) this.setState({ dashboardId: savedObject.response.id });
-    });
   }
 
   async componentDidMount() {
     this.getDetector();
+
+    const pendingDashboardCreationPromise = pendingDashboardCreations[this.state.detectorId];
+    if (pendingDashboardCreationPromise) {
+      pendingDashboardCreationPromise.then((savedObject) => {
+        if (savedObject && savedObject.ok) {
+          this.setState({ dashboardId: savedObject.response.id });
+          this.getTabs();
+        }
+        delete pendingDashboardCreations[this.state.detectorId];
+      });
+    } else {
+      const dashboards = await this.props.savedObjectsService.getDashboards();
+      let detectorDashboardId;
+      dashboards.some((dashboard) => {
+        if (
+          dashboard.references.findIndex((reference) => reference.id === this.state.detectorId) > -1
+        ) {
+          detectorDashboardId = dashboard.id;
+          return true;
+        }
+
+        return false;
+      });
+
+      if (detectorDashboardId) {
+        this.setState({ dashboardId: detectorDashboardId });
+        this.getTabs();
+      }
+    }
   }
 
   getDetector = async () => {
@@ -253,15 +286,8 @@ export class DetectorDetails extends React.Component<DetectorDetailsProps, Detec
 
   createHeaderActions(): React.ReactNode[] {
     const { loading } = this.state;
-    const onClickActions = [
-      { name: 'View Alerts', onClick: this.onViewAlertsClick },
-      { name: 'View Findings', onClick: this.onViewFindingsClick },
-    ];
     const { isActionsMenuOpen } = this.state;
     return [
-      ...onClickActions.map((action) => (
-        <EuiButton onClick={action.onClick}>{action.name}</EuiButton>
-      )),
       <EuiPopover
         id={'detectorsActionsPopover'}
         button={
@@ -285,16 +311,38 @@ export class DetectorDetails extends React.Component<DetectorDetailsProps, Detec
           items={[
             <EuiContextMenuItem
               disabled={loading}
-              key={'Delete'}
+              key={'ViewAlerts'}
               icon={'empty'}
-              onClick={() => {
-                this.closeActionsPopover();
-                this.onDelete();
-              }}
-              data-test-subj={'editButton'}
+              onClick={this.onViewAlertsClick}
+              data-test-subj={'viewAlertsButton'}
             >
-              Delete
+              View Alerts
             </EuiContextMenuItem>,
+            <EuiContextMenuItem
+              disabled={loading}
+              key={'ViewFindings'}
+              icon={'empty'}
+              onClick={this.onViewFindingsClick}
+              data-test-subj={'viewFindingsButton'}
+            >
+              View Findings
+            </EuiContextMenuItem>,
+            <>
+              {this.state.dashboardId ? (
+                <EuiContextMenuItem
+                  disabled={loading}
+                  key={'ViewDashboard'}
+                  icon={'empty'}
+                  onClick={() =>
+                    window.open(`dashboards#/view/${this.state.dashboardId}`, '_blank')
+                  }
+                  data-test-subj={'viewDashboard'}
+                >
+                  View detector dashboard
+                </EuiContextMenuItem>
+              ) : null}
+            </>,
+            <EuiHorizontalRule margin="xs" />,
             <EuiContextMenuItem
               disabled={loading}
               key={'Toggle detector'}
@@ -307,6 +355,18 @@ export class DetectorDetails extends React.Component<DetectorDetailsProps, Detec
             >
               {`${this.detectorHit._source.enabled ? 'Stop' : 'Start'} detector`}
             </EuiContextMenuItem>,
+            <EuiContextMenuItem
+              disabled={loading}
+              key={'Delete'}
+              icon={'empty'}
+              onClick={() => {
+                this.closeActionsPopover();
+                this.onDelete();
+              }}
+              data-test-subj={'editButton'}
+            >
+              Delete
+            </EuiContextMenuItem>,
           ]}
         />
       </EuiPopover>,
diff --git a/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap b/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap
index 31eef5401..6eb956b33 100644
--- a/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap
+++ b/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap
@@ -320,112 +320,6 @@ exports[`<DetectorDetails /> spec renders the component 1`] = `
               <EuiFlexItem
                 grow={false}
                 key="0"
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiButton
-                    onClick={[Function]}
-                  >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
-                      isDisabled={false}
-                      onClick={[Function]}
-                      type="button"
-                    >
-                      <button
-                        className="euiButton euiButton--primary"
-                        disabled={false}
-                        onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
-                        type="button"
-                      >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          textProps={
-                            Object {
-                              "className": "euiButton__text",
-                            }
-                          }
-                        >
-                          <span
-                            className="euiButtonContent euiButton__content"
-                          >
-                            <span
-                              className="euiButton__text"
-                            >
-                              View Alerts
-                            </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem
-                grow={false}
-                key="1"
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiButton
-                    onClick={[Function]}
-                  >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
-                      isDisabled={false}
-                      onClick={[Function]}
-                      type="button"
-                    >
-                      <button
-                        className="euiButton euiButton--primary"
-                        disabled={false}
-                        onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
-                        type="button"
-                      >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          textProps={
-                            Object {
-                              "className": "euiButton__text",
-                            }
-                          }
-                        >
-                          <span
-                            className="euiButtonContent euiButton__content"
-                          >
-                            <span
-                              className="euiButton__text"
-                            >
-                              View Findings
-                            </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem
-                grow={false}
-                key="2"
               >
                 <div
                   className="euiFlexItem euiFlexItem--flexGrowZero"
@@ -1860,6 +1754,100 @@ exports[`<DetectorDetails /> spec renders the component 1`] = `
                       </EuiFormRow>
                     </div>
                   </EuiFlexItem>
+                  <EuiFlexItem
+                    grow={false}
+                    key="3"
+                    style={
+                      Object {
+                        "minWidth": "25%",
+                      }
+                    }
+                  >
+                    <div
+                      className="euiFlexItem euiFlexItem--flexGrowZero"
+                      style={
+                        Object {
+                          "minWidth": "25%",
+                        }
+                      }
+                    >
+                      <EuiFormRow
+                        describedByIds={Array []}
+                        display="row"
+                        fullWidth={false}
+                        hasChildLabel={true}
+                        hasEmptyLabelSpace={false}
+                        label={
+                          <EuiText
+                            color="subdued"
+                          >
+                            Detector dashboard
+                          </EuiText>
+                        }
+                        labelType="label"
+                      >
+                        <div
+                          className="euiFormRow"
+                          id="some_html_id-row"
+                        >
+                          <div
+                            className="euiFormRow__labelWrapper"
+                          >
+                            <EuiFormLabel
+                              className="euiFormRow__label"
+                              htmlFor="some_html_id"
+                              isFocused={false}
+                              type="label"
+                            >
+                              <label
+                                className="euiFormLabel euiFormRow__label"
+                                htmlFor="some_html_id"
+                              >
+                                <EuiText
+                                  color="subdued"
+                                >
+                                  <div
+                                    className="euiText euiText--medium"
+                                  >
+                                    <EuiTextColor
+                                      color="subdued"
+                                      component="div"
+                                    >
+                                      <div
+                                        className="euiTextColor euiTextColor--subdued"
+                                      >
+                                        Detector dashboard
+                                      </div>
+                                    </EuiTextColor>
+                                  </div>
+                                </EuiText>
+                              </label>
+                            </EuiFormLabel>
+                          </div>
+                          <div
+                            className="euiFormRow__fieldWrapper"
+                          >
+                            <EuiText
+                              data-test-subj="text-details-group-content-detector-dashboard"
+                              id="some_html_id"
+                              onBlur={[Function]}
+                              onFocus={[Function]}
+                            >
+                              <div
+                                className="euiText euiText--medium"
+                                data-test-subj="text-details-group-content-detector-dashboard"
+                                id="some_html_id"
+                                onBlur={[Function]}
+                                onFocus={[Function]}
+                              >
+                                Not available for this log type
+                              </div>
+                            </EuiText>
+                          </div>
+                        </div>
+                      </EuiFormRow>
+                    </div>
+                  </EuiFlexItem>
                 </div>
               </EuiFlexGroup>
               <EuiSpacer
diff --git a/public/pages/Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap b/public/pages/Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap
index f140ca71f..ee248aae5 100644
--- a/public/pages/Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap
+++ b/public/pages/Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap
@@ -822,6 +822,100 @@ exports[`<DetectorDetailsView /> spec renders the component 1`] = `
                     </EuiFormRow>
                   </div>
                 </EuiFlexItem>
+                <EuiFlexItem
+                  grow={false}
+                  key="3"
+                  style={
+                    Object {
+                      "minWidth": "25%",
+                    }
+                  }
+                >
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    style={
+                      Object {
+                        "minWidth": "25%",
+                      }
+                    }
+                  >
+                    <EuiFormRow
+                      describedByIds={Array []}
+                      display="row"
+                      fullWidth={false}
+                      hasChildLabel={true}
+                      hasEmptyLabelSpace={false}
+                      label={
+                        <EuiText
+                          color="subdued"
+                        >
+                          Detector dashboard
+                        </EuiText>
+                      }
+                      labelType="label"
+                    >
+                      <div
+                        className="euiFormRow"
+                        id="some_html_id-row"
+                      >
+                        <div
+                          className="euiFormRow__labelWrapper"
+                        >
+                          <EuiFormLabel
+                            className="euiFormRow__label"
+                            htmlFor="some_html_id"
+                            isFocused={false}
+                            type="label"
+                          >
+                            <label
+                              className="euiFormLabel euiFormRow__label"
+                              htmlFor="some_html_id"
+                            >
+                              <EuiText
+                                color="subdued"
+                              >
+                                <div
+                                  className="euiText euiText--medium"
+                                >
+                                  <EuiTextColor
+                                    color="subdued"
+                                    component="div"
+                                  >
+                                    <div
+                                      className="euiTextColor euiTextColor--subdued"
+                                    >
+                                      Detector dashboard
+                                    </div>
+                                  </EuiTextColor>
+                                </div>
+                              </EuiText>
+                            </label>
+                          </EuiFormLabel>
+                        </div>
+                        <div
+                          className="euiFormRow__fieldWrapper"
+                        >
+                          <EuiText
+                            data-test-subj="text-details-group-content-detector-dashboard"
+                            id="some_html_id"
+                            onBlur={[Function]}
+                            onFocus={[Function]}
+                          >
+                            <div
+                              className="euiText euiText--medium"
+                              data-test-subj="text-details-group-content-detector-dashboard"
+                              id="some_html_id"
+                              onBlur={[Function]}
+                              onFocus={[Function]}
+                            >
+                              Not available for this log type
+                            </div>
+                          </EuiText>
+                        </div>
+                      </div>
+                    </EuiFormRow>
+                  </div>
+                </EuiFlexItem>
               </div>
             </EuiFlexGroup>
             <EuiSpacer
diff --git a/public/pages/Findings/components/FindingDetailsFlyout.tsx b/public/pages/Findings/components/FindingDetailsFlyout.tsx
index 41b835154..d17724fa5 100644
--- a/public/pages/Findings/components/FindingDetailsFlyout.tsx
+++ b/public/pages/Findings/components/FindingDetailsFlyout.tsx
@@ -27,6 +27,7 @@ import {
   EuiSpacer,
   EuiText,
   EuiTitle,
+  EuiIcon,
 } from '@elastic/eui';
 import { capitalizeFirstLetter, renderTime } from '../../../utils/helpers';
 import { DEFAULT_EMPTY_DATA, ROUTES } from '../../../utils/constants';
@@ -238,6 +239,7 @@ export default class FindingDetailsFlyout extends Component<
               }}
             >
               View surrounding documents
+              <EuiIcon type={'popout'} />
             </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
index 734240fe5..6029454de 100644
--- a/public/pages/Main/Main.tsx
+++ b/public/pages/Main/Main.tsx
@@ -363,6 +363,7 @@ export default class Main extends Component<MainProps, MainState> {
                           render={(props: RouteComponentProps<{}, any, any>) => (
                             <DetectorDetails
                               detectorService={services.detectorsService}
+                              savedObjectsService={services.savedObjectsService}
                               {...props}
                               notifications={core?.notifications}
                             />
diff --git a/public/services/SavedObjectService.ts b/public/services/SavedObjectService.ts
index f414aa62b..efa7d7dd2 100644
--- a/public/services/SavedObjectService.ts
+++ b/public/services/SavedObjectService.ts
@@ -3,7 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SavedObjectsClientContract, SimpleSavedObject } from 'opensearch-dashboards/public';
+import {
+  SavedObjectReference,
+  SavedObjectsClientContract,
+  SimpleSavedObject,
+} from 'opensearch-dashboards/public';
 import { ISavedObjectsService, ServerResponse } from '../../types';
 import { getSavedObjectConfigs } from '../store/savedObjectsConfig';
 import { logTypesWithDashboards } from '../utils/constants';
@@ -90,4 +94,18 @@ export default class SavedObjectService implements ISavedObjectsService {
 
     return Promise.reject('Log type not yet supported');
   }
+
+  public getDashboards = async (): Promise<
+    SimpleSavedObject<{ references: SavedObjectReference[]; id?: string }>[]
+  > => {
+    const dashboards = await this.savedObjectsClient
+      .find<{ references: SavedObjectReference[]; id?: string }>({
+        type: 'dashboard',
+        fields: ['references', 'id'],
+        perPage: 10000,
+      })
+      .then((response) => response.savedObjects);
+
+    return Promise.resolve(dashboards);
+  };
 }
diff --git a/types/services/ISavedObjectsService.ts b/types/services/ISavedObjectsService.ts
index 357a5ab1e..bc0d27a53 100644
--- a/types/services/ISavedObjectsService.ts
+++ b/types/services/ISavedObjectsService.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SimpleSavedObject } from 'opensearch-dashboards/public';
+import { SavedObjectReference, SimpleSavedObject } from 'opensearch-dashboards/public';
 import { ServerResponse } from './ServerResponse';
 
 export interface ISavedObjectsService {
@@ -12,4 +12,7 @@ export interface ISavedObjectsService {
     logType: string,
     detectorId: string
   ): Promise<ServerResponse<SimpleSavedObject>>;
+  getDashboards(): Promise<
+    SimpleSavedObject<{ references: SavedObjectReference[]; id?: string }>[]
+  >;
 }