diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index 015351cf9..3ab6142a4 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -170,7 +170,7 @@ KDCoordinate VariableBoxController::ContentViewController::rowHeight(int index)
   }
   ExpressionLayout * expressionLayout = expressionLayoutForIndex(index);
   if (expressionLayout) {
-    return expressionLayout->size().height()+k_leafMargin;
+    return max(expressionLayout->size().height()+k_leafMargin, Metric::ToolboxRowHeight);
   }
   return Metric::ToolboxRowHeight;
 }
diff --git a/apps/variable_box_controller.h b/apps/variable_box_controller.h
index 2ada661ea..110d5d0f5 100644
--- a/apps/variable_box_controller.h
+++ b/apps/variable_box_controller.h
@@ -42,13 +42,13 @@ private:
 #endif
       Matrix
     };
-    constexpr static int k_maxNumberOfDisplayedRows = 6; //240/40
+    constexpr static int k_maxNumberOfDisplayedRows = 6; //240/Matrix::ToolboxRowHeight
 #if LIST_VARIABLES
     constexpr static int k_numberOfMenuRows = 3;
 #else
     constexpr static int k_numberOfMenuRows = 2;
 #endif
-    constexpr static KDCoordinate k_leafMargin = 10;
+    constexpr static KDCoordinate k_leafMargin = 20;
     Page pageAtIndex(int index);
     void putLabelAtIndexInBuffer(int index, char * buffer);
     I18n::Message nodeLabelAtIndex(int index);