diff --git a/resources/assets/js/components/DrawerOverlay/view.vue b/resources/assets/js/components/DrawerOverlay/view.vue
index 9114e2b8c..02e2edaac 100644
--- a/resources/assets/js/components/DrawerOverlay/view.vue
+++ b/resources/assets/js/components/DrawerOverlay/view.vue
@@ -17,7 +17,11 @@
             :reverse="true"
             :beforeResize="beforeResize"
             @on-change="onChangeResize"/>
-        <div class="overlay-content"><slot/></div>
+        <div class="overlay-content">
+            <div class="overlay-content-status"></div>
+            <div class="overlay-content-body"><slot/></div>
+            <div class="overlay-content-navigation"></div>
+        </div>
     </div>
 </template>
 
diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss
index 0f1ba7db2..d779da6a2 100644
--- a/resources/assets/sass/components/drawer-overlay.scss
+++ b/resources/assets/sass/components/drawer-overlay.scss
@@ -1,3 +1,16 @@
+body {
+    .ivu-modal-wrap {
+        &.common-drawer-overlay {
+            .ivu-modal {
+                .ivu-modal-content {
+                    margin-top: 0;
+                    margin-bottom: 0;
+                }
+            }
+        }
+    }
+}
+
 .common-drawer-overlay {
     .ivu-modal {
         margin: 0;
@@ -35,6 +48,7 @@
             display: flex;
             align-items: flex-end;
             justify-content: flex-end;
+            padding-top: var(--status-bar-height);
 
             > a {
                 display: flex;
@@ -76,6 +90,24 @@
             background: #fff;
             border-radius: 18px 18px 0 0;
             cursor: default;
+            display: flex;
+            flex-direction: column;
+
+            .overlay-content-status {
+                flex-shrink: 0;
+                height: var(--status-bar-height);
+            }
+
+            .overlay-content-body {
+                flex: 1;
+                height: 0;
+                position: relative;
+            }
+
+            .overlay-content-navigation {
+                flex-shrink: 0;
+                height: var(--navigation-bar-height);
+            }
 
             .ivu-modal-wrap-apply {
                 .ivu-modal-wrap-apply-title {
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 4dbb0a130..05a2e4345 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -63,6 +63,7 @@
         flex-shrink: 0;
         border-right: 1px solid #F4F4F5;
         overflow: auto;
+        z-index: 1;
         > ul {
             padding: 12px 0 0 32px;
             > li {