diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index d72b7fc20..7b60010a2 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -98,6 +98,13 @@ void EditExpressionController::layoutFieldDidChangeSize(::LayoutField * layoutFi
   if (!m_inputViewHeightIsMaximal || !newInputViewHeightIsMaximal) {
     m_inputViewHeightIsMaximal = newInputViewHeightIsMaximal;
     reloadView();
+  } else {
+    /* The input view is already at maximal size so we do not need to relayout
+     * the view underneath, but the view inside the input view might still need
+     * to be relayouted.
+     * We force the relayout because the frame stays the same but we need to
+     * propagate a relayout to the content of the field scroll view. */
+    m_contentView.expressionField()->layoutSubviews(true);
   }
 }
 
diff --git a/escher/src/input_view_controller.cpp b/escher/src/input_view_controller.cpp
index 766ad58ae..669c7e60c 100644
--- a/escher/src/input_view_controller.cpp
+++ b/escher/src/input_view_controller.cpp
@@ -92,6 +92,13 @@ void InputViewController::layoutFieldDidChangeSize(LayoutField * layoutField) {
   if (!m_inputViewHeightIsMaximal || !newInputViewHeightIsMaximal) {
     m_inputViewHeightIsMaximal = newInputViewHeightIsMaximal;
     reloadModalViewController();
+  } else {
+    /* The input view is already at maximal size so we do not need to relayout
+     * the view underneath, but the view inside the input view might still need
+     * to be relayouted.
+     * We force the relayout because the frame stays the same but we need to
+     * propagate a relayout to the content of the field scroll view. */
+    m_expressionFieldController.expressionField()->layoutSubviews(true);
   }
 }