diff --git a/packages/rocketchat-theme/client/imports/components/contextual-bar.css b/packages/rocketchat-theme/client/imports/components/contextual-bar.css
index e9e59007df5d3..5e59630b7cef4 100644
--- a/packages/rocketchat-theme/client/imports/components/contextual-bar.css
+++ b/packages/rocketchat-theme/client/imports/components/contextual-bar.css
@@ -30,6 +30,8 @@
 	&__content {
 		overflow: auto;
 
+		height: 100%;
+
 		padding: var(--default-padding);
 
 		& .js-back {
diff --git a/packages/rocketchat-theme/client/imports/forms/popup-list.css b/packages/rocketchat-theme/client/imports/forms/popup-list.css
index 923e580cb18d9..0d0efef10fa30 100644
--- a/packages/rocketchat-theme/client/imports/forms/popup-list.css
+++ b/packages/rocketchat-theme/client/imports/forms/popup-list.css
@@ -3,13 +3,19 @@
 
 	width: 100%;
 
+	padding: 0 4px;
+
 	&__list {
+		overflow-y: auto;
+
 		width: 100%;
+		max-height: 312px;
+
 		padding: 1rem;
 
 		border-radius: var(--popup-list-border-radius);
 		background-color: var(--popup-list-background);
-		box-shadow: 0 0 2px 0 rgba(47, 52, 61, 0.08), 0 0 12px 0 rgba(47, 52, 61, 0.12);
+		box-shadow: 0 0 2px 0 rgba(47, 52, 61, 0.08), 0 0 8px 0 rgba(47, 52, 61, 0.12);
 	}
 
 	&__item {