diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 0ff70a897c..38ce23f065 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -555,6 +555,8 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 LocalLayout::LocalLayout(QWidget * parent)
 	: UiWidget<Ui::LocalLayoutUi>(parent), current_id_(0), validated_(false)
 {
+	locallayoutTE->setFont(guiApp->typewriterSystemFont());
+	locallayoutTE->setWordWrapMode(QTextOption::NoWrap);
 	connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
 	connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
 	connect(convertPB, SIGNAL(clicked()), this, SLOT(convertPressed()));
diff --git a/status.23x b/status.23x
index cf7da01274..d85e56d0fb 100644
--- a/status.23x
+++ b/status.23x
@@ -80,6 +80,8 @@ What's new
 
 - Provide simple search functionality in preamble (bug 11099).
 
+- Change Settings -> Local Layout to Fixed-width Font and Nowrap (bug 10992).
+
 
 * DOCUMENTATION AND LOCALIZATION