diff --git a/client/res/templates/notification/list.tpl b/client/res/templates/notification/list.tpl
index c8b0bbc046..63f2d2d2dc 100644
--- a/client/res/templates/notification/list.tpl
+++ b/client/res/templates/notification/list.tpl
@@ -23,6 +23,6 @@
 
 <div class="row">
     <div class="col-md-8">
-        <div class="list-container notification-list">{{{list}}}</div>
+        <div class="list-container notification-list list-container-panel">{{{list}}}</div>
     </div>
 </div>
diff --git a/client/res/templates/stream.tpl b/client/res/templates/stream.tpl
index 5277c3adef..db054bd9d5 100644
--- a/client/res/templates/stream.tpl
+++ b/client/res/templates/stream.tpl
@@ -29,6 +29,6 @@
         <div class="create-post-container">
             {{{createPost}}}
         </div>
-        <div class="list-container">{{{list}}}</div>
+        <div class="list-container list-container-panel">{{{list}}}</div>
     </div>
 </div>
diff --git a/client/src/views/notification/list.js b/client/src/views/notification/list.js
index f02b1cf222..99165e4dfd 100644
--- a/client/src/views/notification/list.js
+++ b/client/src/views/notification/list.js
@@ -90,8 +90,7 @@ define('views/notification/list', ['view'], function (Dep) {
                 .then(() => this.createView('list', viewName, options))
                 .then(view => view.render())
                 .then(view => {
-                    view.$el.find('> .list > .list-group')
-                        .addClass('list-group-panel');
+                    view.$el.find('> .list > .list-group');
                 });
         },
     });
diff --git a/client/src/views/stream.js b/client/src/views/stream.js
index e74f80d897..07c98085ed 100644
--- a/client/src/views/stream.js
+++ b/client/src/views/stream.js
@@ -104,8 +104,7 @@ define('views/stream', ['view'], function (Dep) {
 
                         view.render()
                             .then(view => {
-                                view.$el.find('> .list > .list-group')
-                                    .addClass('list-group-panel');
+                                view.$el.find('> .list > .list-group');
                             });
                     });
                 });
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index d2d36409db..2d16b5ff9c 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -2592,23 +2592,65 @@ table.table td.cell .html-container {
     }
 }
 
+.list-container-panel > div {
+    background-color: @panel-bg;
+    border-radius: var(--panel-border-radius);
+    border: var(--panel-border-width) solid var(--panel-default-border);
+
+    > .list-group {
+        > .list-group-item {
+            border-left-width: 0;
+            border-right-width: 0;
+            border-top-width: 0;
+
+            &:last-child {
+                border-bottom-width: 0;
+            }
+        }
+    }
+
+    > table:first-child,
+    > .list-group:first-child,
+    > .list-group:first-child > .list-group-item:first-child {
+        border-top-left-radius: var(--panel-border-radius);
+        border-top-right-radius: var(--panel-border-radius);
+    }
+
+    > table,
+    > .list-group,
+    > .list-group:last-child > .list-group-item:last-child,
+    > .show-more > a {
+        border-bottom-left-radius: var(--panel-border-radius);
+        border-bottom-right-radius: var(--panel-border-radius);
+    }
+
+    > .show-more > a {
+        border-bottom-left-radius: var(--panel-border-radius);
+        border-bottom-right-radius: var(--panel-border-radius);
+    }
+}
+
 .list-group-panel {
     background-color: @panel-bg;
+    border-radius: var(--panel-border-radius);
+    border: var(--panel-border-width) solid var(--panel-default-border);
 
     > .list-group-item {
         border-left: 0;
         border-right: 0;
 
         &:first-child {
-            border-top: 0
+            border-top: 0;
+            border-top-left-radius: var(--panel-border-radius);
+            border-top-right-radius: var(--panel-border-radius);
         }
 
         &:last-child {
-            border-bottom: 0
+            border-bottom: 0;
+            border-bottom-left-radius: var(--panel-border-radius);
+            border-bottom-right-radius: var(--panel-border-radius);
         }
     }
-
-    border: var(--panel-border-width) solid var(--default-border-color);
 }
 
 .field .array-control-container {