diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.tsx
index c8dec8bf53..66a870a708 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.tsx
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.tsx
@@ -51,37 +51,39 @@ const Recommendations = () => {
       <div>
         {renderBadgesLegend()}
       </div>
-      {recommendations.map(({ name }) => {
-        const { id = '', title = '', content = '', badges = [] } = recommendationsContent[name]
+      <div className={styles.recommendationsContainer}>
+        {recommendations.map(({ name }) => {
+          const { id = '', title = '', content = '', badges = [] } = recommendationsContent[name]
 
-        const buttonContent = (
-          <EuiFlexGroup className={styles.accordionButton} responsive={false} alignItems="center" justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>{title}</EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              {renderBadges(badges)}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        )
-        return (
-          <div key={id} className={styles.recommendation}>
-            <EuiAccordion
-              id={name}
-              arrowDisplay="right"
-              buttonContent={buttonContent}
-              buttonClassName={styles.accordionBtn}
-              buttonProps={{ 'data-test-subj': `${id}-button` }}
-              className={styles.accordion}
-              initialIsOpen
-              onToggle={(isOpen) => handleToggle(isOpen, id)}
-              data-testid={`${id}-accordion`}
-            >
-              <EuiPanel className={styles.accordionContent} color="subdued">
-                {renderContent(content)}
-              </EuiPanel>
-            </EuiAccordion>
-          </div>
-        )
-      })}
+          const buttonContent = (
+            <EuiFlexGroup className={styles.accordionButton} responsive={false} alignItems="center" justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>{title}</EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                {renderBadges(badges)}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          )
+          return (
+            <div key={id} className={styles.recommendation}>
+              <EuiAccordion
+                id={name}
+                arrowDisplay="right"
+                buttonContent={buttonContent}
+                buttonClassName={styles.accordionBtn}
+                buttonProps={{ 'data-test-subj': `${id}-button` }}
+                className={styles.accordion}
+                initialIsOpen
+                onToggle={(isOpen) => handleToggle(isOpen, id)}
+                data-testid={`${id}-accordion`}
+              >
+                <EuiPanel className={styles.accordionContent} color="subdued">
+                  {renderContent(content)}
+                </EuiPanel>
+              </EuiAccordion>
+            </div>
+          )
+        })}
+      </div>
     </div>
   )
 }
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/styles.module.scss b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/styles.module.scss
index 46ec75adb3..c7b1726a73 100644
--- a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/styles.module.scss
+++ b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/styles.module.scss
@@ -3,14 +3,10 @@
 @import "@elastic/eui/src/global_styling/index";
 
 .wrapper {
-  @include euiScrollBar;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 100%;
-  padding-top: 30px;
+  height: 100%;
 
   .badgesLegend {
-    margin: 0 22px 14px 0 !important;
+    margin: 20px 22px 14px 0 !important;
 
     .badgeWrapper {
       margin-right: 0;
@@ -34,6 +30,13 @@
     align-items: center;
     margin-right: 24px;
   }
+}
+
+.recommendationsContainer {
+  @include euiScrollBar;
+  overflow-y: auto;
+  overflow-x: hidden;
+  max-height: 100%;
 
   .accordionButton :global(.euiFlexItem) {
     margin: 0;