diff --git a/Oqtane.Client/wwwroot/css/site.css b/Oqtane.Client/wwwroot/css/site.css
index ac8d08a8..443fddd0 100644
--- a/Oqtane.Client/wwwroot/css/site.css
+++ b/Oqtane.Client/wwwroot/css/site.css
@@ -105,6 +105,7 @@ app {
     .main .top-row {
         position: sticky;
         top: 0;
+        z-index: 9999;
     }
 
     .main > div {
@@ -149,7 +150,7 @@ app {
     height: 100%;
     width: 0;
     position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
+    z-index: 9999; /* Sit on top */
     right: 0; /* Position at right side of screen */
     top: 0; /* Position at top of screen */
     background-color: rgb(0,0,0); /* Black fallback color */
@@ -192,7 +193,7 @@ app {
 .modal {
     display: none; /* Hidden by default */
     position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
+    z-index: 9999; /* Sit on top */
     left: 0;
     top: 0;
     width: 100%; /* Full width */
@@ -235,6 +236,7 @@ app {
 }
 
 .pane-admin-border {
+    width: 100%;
     border-width: 1px;
     border-style: dashed;
     border-color: gray;
@@ -253,5 +255,5 @@ app {
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 999;
+    z-index: 9999; /* Sit on top */
 }
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/css/site.css b/Oqtane.Server/wwwroot/css/site.css
index a628c570..5a0e330e 100644
--- a/Oqtane.Server/wwwroot/css/site.css
+++ b/Oqtane.Server/wwwroot/css/site.css
@@ -105,6 +105,7 @@ app {
     .main .top-row {
         position: sticky;
         top: 0;
+        z-index: 9999;
     }
 
     .main > div {
@@ -150,7 +151,7 @@ app {
     height: 100%;
     width: 0;
     position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
+    z-index: 9999; /* Sit on top */
     right: 0;
     top: 0;
     background-color: rgb(0,0,0); /* Black fallback color */
@@ -193,7 +194,7 @@ app {
 .modal {
     display: none; /* Hidden by default */
     position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
+    z-index: 9999; /* Sit on top */
     left: 0;
     top: 0;
     width: 100%; /* Full width */
@@ -236,6 +237,7 @@ app {
 }
 
 .pane-admin-border {
+    width: 100%;
     border-width: 1px;
     border-style: dashed;
     border-color: gray;
@@ -254,5 +256,5 @@ app {
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 999;
+    z-index: 9999; /* Sit on top */
 }
\ No newline at end of file