diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index cdc3a6957..31192755c 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -26,6 +26,7 @@ View * VariableBoxController::ContentViewController::view() {
 
 void VariableBoxController::ContentViewController::didBecomeFirstResponder() {
   m_selectableTableView.reloadData();
+  m_selectableTableView.scrollToCell(0,0);
   m_selectableTableView.selectCellAtLocation(0, m_firstSelectedRow);
   app()->setFirstResponder(&m_selectableTableView);
 }
diff --git a/escher/include/escher/metric.h b/escher/include/escher/metric.h
index 50d6e4836..87ea4335c 100644
--- a/escher/include/escher/metric.h
+++ b/escher/include/escher/metric.h
@@ -11,9 +11,9 @@ public:
   constexpr static KDCoordinate CommonBottomMargin = 15;
   constexpr static KDCoordinate ParameterCellHeight = 35;
   constexpr static KDCoordinate ModalTopMargin = 5;
-  constexpr static KDCoordinate ModalBottomMargin = 20;
+  constexpr static KDCoordinate ModalBottomMargin = 18;
   constexpr static KDCoordinate TabHeight = 27;
   constexpr static KDCoordinate ScrollStep = 10;
 };
 
-#endif
\ No newline at end of file
+#endif