diff --git a/src/frontends/qt4/ui/PrefInputUi.ui b/src/frontends/qt4/ui/PrefInputUi.ui
index ce093ab2ca..8e4d1f86ba 100644
--- a/src/frontends/qt4/ui/PrefInputUi.ui
+++ b/src/frontends/qt4/ui/PrefInputUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
-    <height>567</height>
+    <width>480</width>
+    <height>609</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -116,19 +116,19 @@
       <item>
        <widget class="QGroupBox" name="groupBox_2" >
         <property name="title" >
-         <string>Popup</string>
+         <string>In Text</string>
         </property>
         <property name="flat" >
          <bool>false</bool>
         </property>
         <layout class="QVBoxLayout" >
          <item>
-          <widget class="QCheckBox" name="popupMathCB" >
+          <widget class="QCheckBox" name="inlineTextCB" >
            <property name="toolTip" >
-            <string>Show the popup in math mode after the delay.</string>
+            <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
            </property>
            <property name="text" >
-            <string>Automatically show in math mode</string>
+            <string>Automatic inline completion</string>
            </property>
           </widget>
          </item>
@@ -138,71 +138,17 @@
             <string>Show the popup after the set delay in text mode.</string>
            </property>
            <property name="text" >
-            <string>Automatically show in text mode</string>
+            <string>Automatic popup</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="popupAfterCompleteCB" >
-           <property name="toolTip" >
-            <string>When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away.</string>
-           </property>
-           <property name="text" >
-            <string>Show without delay for non-unique completions</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" >
-           <item>
-            <widget class="QLabel" name="label_3" >
-             <property name="text" >
-              <string>Delay</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QDoubleSpinBox" name="popupDelaySB" >
-             <property name="toolTip" >
-              <string>After the cursor has not moved for this time, the completion popup is shown if it is available.</string>
-             </property>
-             <property name="maximum" >
-              <double>10.000000000000000</double>
-             </property>
-             <property name="singleStep" >
-              <double>0.100000000000000</double>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label" >
-             <property name="text" >
-              <string>s</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer>
-             <property name="orientation" >
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" >
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupBox_3" >
         <property name="title" >
-         <string>Inline</string>
+         <string>In Math</string>
         </property>
         <property name="flat" >
          <bool>false</bool>
@@ -214,39 +160,31 @@
             <string>Show the grey inline completion behind the cursor in math mode after the delay.</string>
            </property>
            <property name="text" >
-            <string>Automatically show in math mode</string>
+            <string>Automatic inline completion</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="inlineTextCB" >
+          <widget class="QCheckBox" name="popupMathCB" >
            <property name="toolTip" >
-            <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
+            <string>Show the popup in math mode after the delay.</string>
            </property>
            <property name="text" >
-            <string>Automatically show in text mode</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="inlineDotsCB" >
-           <property name="toolTip" >
-            <string>Long completions are cut-off and shown with "...".</string>
-           </property>
-           <property name="text" >
-            <string>Use "..." to shorten long completions</string>
+            <string>Automatic popup</string>
            </property>
           </widget>
          </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_4" >
+        <property name="title" >
+         <string>General</string>
+        </property>
+        <layout class="QVBoxLayout" >
          <item>
           <layout class="QHBoxLayout" >
-           <item>
-            <widget class="QLabel" name="label_4" >
-             <property name="text" >
-              <string>Delay</string>
-             </property>
-            </widget>
-           </item>
            <item>
             <widget class="QDoubleSpinBox" name="inlineDelaySB" >
              <property name="toolTip" >
@@ -261,9 +199,9 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="label_2" >
+            <widget class="QLabel" name="label_4" >
              <property name="text" >
-              <string>s</string>
+              <string>s inline completion delay</string>
              </property>
             </widget>
            </item>
@@ -282,6 +220,63 @@
            </item>
           </layout>
          </item>
+         <item>
+          <layout class="QHBoxLayout" >
+           <item>
+            <widget class="QDoubleSpinBox" name="popupDelaySB" >
+             <property name="toolTip" >
+              <string>After the cursor has not moved for this time, the completion popup is shown if it is available.</string>
+             </property>
+             <property name="maximum" >
+              <double>10.000000000000000</double>
+             </property>
+             <property name="singleStep" >
+              <double>0.100000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_3" >
+             <property name="text" >
+              <string>s popup delay</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="popupAfterCompleteCB" >
+           <property name="toolTip" >
+            <string>When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away.</string>
+           </property>
+           <property name="text" >
+            <string>Show popup without delay for non-unique completions</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="inlineDotsCB" >
+           <property name="toolTip" >
+            <string>Long completions are cut-off and shown with "...".</string>
+           </property>
+           <property name="text" >
+            <string>Use "..." to shorten long completions</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -358,8 +353,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>51</height>
+       <width>408</width>
+       <height>16</height>
       </size>
      </property>
     </spacer>