diff --git a/x-pack/plugins/security/public/authentication/access_notice/_access_notice_page.scss b/x-pack/plugins/security/public/authentication/access_notice/_access_notice_page.scss
index 030d164727c95..46703a0792a13 100644
--- a/x-pack/plugins/security/public/authentication/access_notice/_access_notice_page.scss
+++ b/x-pack/plugins/security/public/authentication/access_notice/_access_notice_page.scss
@@ -2,16 +2,20 @@
   max-width: 600px;
 }
 
-.secAccessNoticePage__container {
-  @include euiBottomShadowSmall;
-  animation: none;
+.secAccessNoticePage__textWrapper {
+  overflow-y: hidden;
 }
 
 .secAccessNoticePage__text {
+  @include euiYScrollWithShadows;
   max-height: 400px;
-  padding-top: $euiSize;
+  padding: $euiSize $euiSizeL 0;
 }
 
 .secAccessNoticePage__footer {
-  justify-content: flex-start;
+  padding: $euiSize $euiSizeL $euiSizeL;
+}
+
+.secAccessNoticePage__footerInner {
+  text-align: left;
 }
diff --git a/x-pack/plugins/security/public/authentication/access_notice/access_notice_page.tsx b/x-pack/plugins/security/public/authentication/access_notice/access_notice_page.tsx
index 15f900832697d..982d2fc139e4e 100644
--- a/x-pack/plugins/security/public/authentication/access_notice/access_notice_page.tsx
+++ b/x-pack/plugins/security/public/authentication/access_notice/access_notice_page.tsx
@@ -9,7 +9,7 @@ import './_index.scss';
 import React, { FormEvent, MouseEvent, useCallback, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import ReactMarkdown from 'react-markdown';
-import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiButton, EuiPanel, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { CoreStart, FatalErrorsStart, HttpStart, NotificationsStart } from 'src/core/public';
@@ -67,33 +67,35 @@ export function AccessNoticePage({ http, fatalErrors, notifications }: Props) {
       }
     >
       <form onSubmit={onAcknowledge}>
-        <div className="euiModal secAccessNoticePage__container">
-          <div className="euiModal__flex">
-            <div className="euiModalBody euiModalBody__overflow secAccessNoticePage__text">
-              <div className="euiModalBody__overflow secAccessNoticePage__text">
+        <EuiPanel paddingSize="none">
+          <EuiFlexGroup gutterSize="none" direction="column">
+            <EuiFlexItem className="secAccessNoticePage__textWrapper">
+              <div className="secAccessNoticePage__text">
                 <EuiText textAlign="left">
                   <ReactMarkdown>{accessNotice}</ReactMarkdown>
                 </EuiText>
               </div>
-            </div>
-            <div className="euiModalFooter secAccessNoticePage__footer">
-              <EuiButton
-                fill
-                type="submit"
-                color="primary"
-                onClick={onAcknowledge}
-                isDisabled={isLoading}
-                isLoading={isLoading}
-                data-test-subj="accessNoticeAcknowledge"
-              >
-                <FormattedMessage
-                  id="xpack.security.accessNotice.acknowledgeButtonText"
-                  defaultMessage="Acknowledge and continue"
-                />
-              </EuiButton>
-            </div>
-          </div>
-        </div>
+            </EuiFlexItem>
+            <EuiFlexItem className="secAccessNoticePage__footer">
+              <div className="secAccessNoticePage__footerInner">
+                <EuiButton
+                  fill
+                  type="submit"
+                  color="primary"
+                  onClick={onAcknowledge}
+                  isDisabled={isLoading}
+                  isLoading={isLoading}
+                  data-test-subj="accessNoticeAcknowledge"
+                >
+                  <FormattedMessage
+                    id="xpack.security.accessNotice.acknowledgeButtonText"
+                    defaultMessage="Acknowledge and continue"
+                  />
+                </EuiButton>
+              </div>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPanel>
         <EuiSpacer size="xxl" />
       </form>
     </AuthenticationStatePage>