diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index b44d6b1d1..86931135e 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -160,8 +160,7 @@ bool EditExpressionController::inputViewDidFinishEditing(const char * text, Layo
   m_calculationStore->push(m_cacheBuffer, calculationApp->localContext());
   m_historyController->reload();
   ((ContentView *)view())->mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
-  ((ContentView *)view())->expressionField()->setEditing(true);
-  ((ContentView *)view())->expressionField()->setText("");
+  ((ContentView *)view())->expressionField()->setEditing(true, true);
   return true;
 }
 
diff --git a/escher/src/layout_field.cpp b/escher/src/layout_field.cpp
index 5164524fc..3ccfd20fd 100644
--- a/escher/src/layout_field.cpp
+++ b/escher/src/layout_field.cpp
@@ -185,9 +185,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
   }
   if (isEditing() && m_delegate->layoutFieldShouldFinishEditing(this, event)) { //TODO use class method?
     setEditing(false);
-    if (m_delegate->layoutFieldDidFinishEditing(this, layout(), event)) {
-      clearLayout();
-    }
+    m_delegate->layoutFieldDidFinishEditing(this, layout(), event);
     return true;
   }
   if ((event == Ion::Events::OK || event == Ion::Events::EXE) && !isEditing()) {