diff --git a/BrowserKit/Sources/MenuKit/MenuMainView.swift b/BrowserKit/Sources/MenuKit/MenuMainView.swift
index d12a318e76be..53d8d2d37cfb 100644
--- a/BrowserKit/Sources/MenuKit/MenuMainView.swift
+++ b/BrowserKit/Sources/MenuKit/MenuMainView.swift
@@ -43,8 +43,8 @@ public final class MenuMainView: UIView,
 
             tableView.topAnchor.constraint(equalTo: accountHeaderView.bottomAnchor),
             tableView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-            tableView.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: -UX.horizontalTableViewMargin),
-            tableView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: UX.horizontalTableViewMargin)
+            tableView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
+            tableView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
         ])
     }
 
diff --git a/BrowserKit/Sources/MenuKit/MenuTableView.swift b/BrowserKit/Sources/MenuKit/MenuTableView.swift
index ed7fdd109cc5..256f008f4c1f 100644
--- a/BrowserKit/Sources/MenuKit/MenuTableView.swift
+++ b/BrowserKit/Sources/MenuKit/MenuTableView.swift
@@ -16,6 +16,8 @@ class MenuTableView: UIView,
                      ThemeApplicable {
     private struct UX {
         static let topPadding: CGFloat = 12
+        static let tableViewMargin: CGFloat = 16
+        static let distanceBetweenSections: CGFloat = 32
     }
 
     private var tableView: UITableView
@@ -26,6 +28,8 @@ class MenuTableView: UIView,
 
     override init(frame: CGRect) {
         tableView = UITableView(frame: .zero, style: .insetGrouped)
+        tableView.layoutMargins = UIEdgeInsets(top: 0, left: UX.tableViewMargin, bottom: 0, right: UX.tableViewMargin)
+        tableView.sectionFooterHeight = 0
         menuData = []
         super.init(frame: .zero)
         setupView()
@@ -70,7 +74,7 @@ class MenuTableView: UIView,
         _ tableView: UITableView,
         heightForHeaderInSection section: Int
     ) -> CGFloat {
-        return section == 0 ? UX.topPadding : UITableView.automaticDimension
+        return section == 0 ? UX.topPadding : UX.distanceBetweenSections
     }
 
     func tableView(