diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 3f7e3c6e0e..12803fa6ae 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1254,7 +1254,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	numberingModule->tocTW->headerItem()->setText(2, qt_("Appears in TOC"));
 	setSectionResizeMode(numberingModule->tocTW->header(), QHeaderView::ResizeToContents);
 	connect(numberingModule->linenoCB, SIGNAL(toggled(bool)),
-		this, SLOT(linenoToggled()));
+		this, SLOT(linenoToggled(bool)));
 	connect(numberingModule->linenoCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 	connect(numberingModule->linenoLE, SIGNAL(textChanged(QString)),
@@ -3816,6 +3816,7 @@ void GuiDocument::paramsToDialog()
 
 	numberingModule->linenoCB->setChecked(bp_.use_lineno);
 	numberingModule->linenoLE->setEnabled(bp_.use_lineno);
+	numberingModule->linenoLA->setEnabled(bp_.use_lineno);
 	numberingModule->linenoLE->setText(toqstr(bp_.lineno_opts));
 
 	// bullets
@@ -4945,9 +4946,10 @@ void GuiDocument::allPackages(int col)
 }
 
 
-void GuiDocument::linenoToggled()
+void GuiDocument::linenoToggled(bool on)
 {
-	numberingModule->linenoLE->setEnabled(numberingModule->linenoCB->isChecked());
+	numberingModule->linenoLE->setEnabled(on);
+	numberingModule->linenoLA->setEnabled(on);
 }
 
 
diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 01fb0de0ef..999be46f7a 100644
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -161,7 +161,7 @@ private Q_SLOTS:
 	void moduleFilterPressed();
 	void moduleFilterChanged(const QString & text);
 	void resetModuleFilter();
-	void linenoToggled();
+	void linenoToggled(bool);
 private:
 	/// validate listings parameters and return an error message, if any
 	QString validateListingsParameters();
diff --git a/src/frontends/qt4/ui/NumberingUi.ui b/src/frontends/qt4/ui/NumberingUi.ui
index 12b9657283..028bbf89f1 100644
--- a/src/frontends/qt4/ui/NumberingUi.ui
+++ b/src/frontends/qt4/ui/NumberingUi.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>310</width>
+    <width>414</width>
     <height>323</height>
    </rect>
   </property>
@@ -33,11 +33,40 @@
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QCheckBox" name="linenoCB">
+       <property name="toolTip">
+        <string>Add line numbers to the document</string>
+       </property>
        <property name="text">
         <string>L&amp;ine numbering</string>
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="linenoLA">
+       <property name="text">
+        <string>O&amp;ptions:</string>
+       </property>
+       <property name="buddy">
+        <cstring>linenoLE</cstring>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLineEdit" name="linenoLE">
        <property name="toolTip">