diff --git a/apps/settings/sub_menu/preferences_controller.cpp b/apps/settings/sub_menu/preferences_controller.cpp
index 3305d8fd5..eadb33627 100644
--- a/apps/settings/sub_menu/preferences_controller.cpp
+++ b/apps/settings/sub_menu/preferences_controller.cpp
@@ -108,6 +108,12 @@ void PreferencesController::willDisplayCellForIndex(HighlightCell * cell, int in
   myCell->setLayout(layoutForPreferences(m_messageTreeModel->children(index)->label()));
 }
 
+KDCoordinate PreferencesController::rowHeight(int j) {
+  /* We cheat for the Writing format subcontroller, because the Edition2D layout
+   * needs more vertical space. */
+  return GenericSubController::rowHeight(j) + (m_messageTreeModel->label() == I18n::Message::EditionMode ? 2 : 0);
+}
+
 void PreferencesController::setPreferenceWithValueIndex(I18n::Message message, int valueIndex) {
   Preferences * preferences = Preferences::sharedPreferences();
   if (message == I18n::Message::AngleUnit) {
diff --git a/apps/settings/sub_menu/preferences_controller.h b/apps/settings/sub_menu/preferences_controller.h
index 05493caf0..2ed186d58 100644
--- a/apps/settings/sub_menu/preferences_controller.h
+++ b/apps/settings/sub_menu/preferences_controller.h
@@ -13,6 +13,7 @@ public:
   HighlightCell * reusableCell(int index, int type) override;
   int reusableCellCount(int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
+  KDCoordinate rowHeight(int j) override;
 protected:
   constexpr static int k_totalNumberOfCell = 2;
 private: