diff --git a/apps/shared/scrollable_exact_approximate_expressions_cell.cpp b/apps/shared/scrollable_exact_approximate_expressions_cell.cpp
index e3cdf620a..b590b3381 100644
--- a/apps/shared/scrollable_exact_approximate_expressions_cell.cpp
+++ b/apps/shared/scrollable_exact_approximate_expressions_cell.cpp
@@ -12,9 +12,11 @@ ScrollableExactApproximateExpressionsCell::ScrollableExactApproximateExpressions
 
 void ScrollableExactApproximateExpressionsCell::setHighlighted(bool highlight) {
   m_view.evenOddCell()->setHighlighted(highlight);
+  reloadScroll();
 }
 
 void ScrollableExactApproximateExpressionsCell::setEven(bool even) {
+  EvenOddCell::setEven(even);
   m_view.evenOddCell()->setEven(even);
 }
 
@@ -39,7 +41,7 @@ View * ScrollableExactApproximateExpressionsCell::subviewAtIndex(int index) {
 }
 
 void ScrollableExactApproximateExpressionsCell::layoutSubviews() {
-  m_view.setFrame(bounds());
+  m_view.setFrame(KDRect(k_margin,k_margin, bounds().width()-2*k_margin, bounds().height()-2*k_margin));
 }
 
 }
diff --git a/apps/shared/scrollable_exact_approximate_expressions_cell.h b/apps/shared/scrollable_exact_approximate_expressions_cell.h
index a9d861ee3..f188e8d71 100644
--- a/apps/shared/scrollable_exact_approximate_expressions_cell.h
+++ b/apps/shared/scrollable_exact_approximate_expressions_cell.h
@@ -23,6 +23,7 @@ public:
     return this;
   }
   void didBecomeFirstResponder() override;
+  constexpr static KDCoordinate k_margin = 5;
 private:
   int numberOfSubviews() const override;
   View * subviewAtIndex(int index) override;