diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index fbaaf4b5e..8bc3c3d85 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -28,6 +28,37 @@
             max-height: 250px;
         }
     }
+    #cp-sidebarlayout-container {
+        #cp-sidebarlayout-rightside {
+            .cp-sidebarlayout-element[data-item] {
+                div#cp-admin-table-container {
+                    overflow-x: auto;
+                    .cp-sidebar-table#cp-admin-table {
+                        tr {
+                            display: flex;
+                        }
+                        th, td {
+                            flex: 1;
+                            word-wrap: break-word;
+                            white-space: normal;
+                            min-width: 13rem;
+                            margin-right: 0px;
+                        }
+                        @media (max-width: @browser_media-not-small) {
+                            width: 100%;
+                            tr {
+                                width: 100%;
+                            }
+                            th, td {
+                                margin-right: 0;
+                                min-width: 7rem;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+}
     .cp-admin-color-current {
         width: 20px;
         height: 20px;
diff --git a/www/admin/inner.js b/www/admin/inner.js
index cdc2996f0..a7b587266 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -1116,6 +1116,9 @@ define([
                 ""
             ];
             var list = blocks.table(header, []);
+            list.setAttribute('id', 'cp-admin-table');
+            let div = blocks.block([list]);
+            div.setAttribute('id', 'cp-admin-table-container');
 
             var nav = blocks.nav([button, refreshButton]);
             var form = blocks.form([
@@ -1216,7 +1219,7 @@ define([
                 });
             });
 
-            cb([form, list]);
+            cb([form, div]);
         });
 
         var getBlockId = (val) => {
@@ -1428,6 +1431,9 @@ define([
                 ""
             ];
             var list = blocks.table(header, []);
+            list.setAttribute('id', 'cp-admin-table');
+            let div = blocks.block([list]);
+            div.setAttribute('id', 'cp-admin-table-container');
 
             var nav = blocks.nav([button, refreshButton]);
 
@@ -1596,7 +1602,7 @@ define([
                 });
             });
 
-            cb([form, list]);
+            cb([form, div]);
         });
 
         // Msg.admin_defaultlimitHint, .admin_defaultlimitTitle
@@ -1756,6 +1762,9 @@ define([
                 Messages.admin_note
             ];
             var table = blocks.table(header, []);
+            table.setAttribute('id', 'cp-admin-table');
+            let div = blocks.block([table]);
+            div.setAttribute('id', 'cp-admin-table-container');
             let $table = $(table).hide();
 
             APP.refreshLimits = function () {
@@ -1813,7 +1822,7 @@ define([
                 });
             };
             APP.refreshLimits();
-            cb(table);
+            cb(div);
         });
 
         // Msg.admin_accountMetadataHint.admin_accountMetadataTitle
@@ -3609,6 +3618,9 @@ define([
             ];
 
             var table = blocks.table(header, []);
+            table.setAttribute('id', 'cp-admin-table');
+            let div = blocks.block([table]);
+            div.setAttribute('id', 'cp-admin-table-container');
 
             const onRefresh = function () {
                 sFrameChan.query('Q_ADMIN_RPC', {
@@ -3641,7 +3653,7 @@ define([
             onRefresh();
             onRefreshPerformance.reg(onRefresh);
 
-            cb(table);
+            cb(div);
         });