diff --git a/x-pack/plugins/osquery/public/live_queries/form/index.tsx b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
index 65f3833c1c92e..6b99e6228be49 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
@@ -17,7 +17,6 @@ import {
   containsDynamicQuery,
   replaceParamsQuery,
 } from '../../../common/utils/replace_params_query';
-import { PLUGIN_NAME as OSQUERY_PLUGIN_NAME } from '../../../common';
 import { QueryPackSelectable } from './query_pack_selectable';
 import type { SavedQuerySOFormData } from '../../saved_queries/form/use_saved_query_form';
 import { useKibana } from '../../common/lib/kibana';
@@ -76,7 +75,7 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
 }) => {
   const alertAttachmentContext = useContext(AlertAttachmentContext);
 
-  const { application, appName } = useKibana().services;
+  const { application } = useKibana().services;
   const permissions = application.capabilities.osquery;
   const canRunPacks = useMemo(
     () =>
@@ -331,11 +330,7 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
       </FormProvider>
 
       {showSavedQueryFlyout ? (
-        <SavedQueryFlyout
-          isExternal={appName !== OSQUERY_PLUGIN_NAME}
-          onClose={handleCloseSaveQueryFlyout}
-          defaultValue={serializedData}
-        />
+        <SavedQueryFlyout onClose={handleCloseSaveQueryFlyout} defaultValue={serializedData} />
       ) : null}
     </>
   );
diff --git a/x-pack/plugins/osquery/public/live_queries/form/query_details_flyout.tsx b/x-pack/plugins/osquery/public/live_queries/form/query_details_flyout.tsx
index c4283e67e42cd..d49fdd390304f 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/query_details_flyout.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/query_details_flyout.tsx
@@ -26,17 +26,10 @@ interface QueryDetailsFlyoutProps {
   };
   onClose: () => void;
 }
-const additionalZIndexStyle = { style: 'z-index: 6000' };
 
 const QueryDetailsFlyoutComponent: React.FC<QueryDetailsFlyoutProps> = ({ action, onClose }) => (
   <EuiPortal>
-    <EuiFlyout
-      size="m"
-      ownFocus
-      onClose={onClose}
-      aria-labelledby="flyoutTitle"
-      maskProps={additionalZIndexStyle} // For an edge case to display above the alerts flyout
-    >
+    <EuiFlyout size="m" ownFocus onClose={onClose} aria-labelledby="flyoutTitle">
       <EuiFlyoutHeader hasBorder>
         <EuiTitle size="s">
           <h2 id="flyoutTitle">
diff --git a/x-pack/plugins/osquery/public/saved_queries/saved_query_flyout.tsx b/x-pack/plugins/osquery/public/saved_queries/saved_query_flyout.tsx
index c6df04ec1ae43..cbbfefce11a4f 100644
--- a/x-pack/plugins/osquery/public/saved_queries/saved_query_flyout.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/saved_query_flyout.tsx
@@ -30,16 +30,9 @@ import { useCreateSavedQuery } from './use_create_saved_query';
 interface AddQueryFlyoutProps {
   defaultValue: SavedQuerySOFormData;
   onClose: () => void;
-  isExternal?: boolean;
 }
 
-const additionalZIndexStyle = { style: 'z-index: 6000' };
-
-const SavedQueryFlyoutComponent: React.FC<AddQueryFlyoutProps> = ({
-  defaultValue,
-  onClose,
-  isExternal,
-}) => {
+const SavedQueryFlyoutComponent: React.FC<AddQueryFlyoutProps> = ({ defaultValue, onClose }) => {
   const createSavedQueryMutation = useCreateSavedQuery({ withRedirect: false });
 
   const hooksForm = useSavedQueryForm({
@@ -67,7 +60,6 @@ const SavedQueryFlyoutComponent: React.FC<AddQueryFlyoutProps> = ({
         ownFocus
         onClose={onClose}
         aria-labelledby="flyoutTitle"
-        maskProps={isExternal ? additionalZIndexStyle : undefined} // For an edge case to display above the alerts flyout
       >
         <EuiFlyoutHeader hasBorder>
           <EuiTitle size="s">