diff --git a/src/frontends/qt4/FindAndReplace.h b/src/frontends/qt4/FindAndReplace.h
index 5b7587e58b..6e5a6577c5 100644
--- a/src/frontends/qt4/FindAndReplace.h
+++ b/src/frontends/qt4/FindAndReplace.h
@@ -30,7 +30,7 @@
 namespace lyx {
 namespace frontend {
 
-class FindAndReplaceWidget : public QWidget, public Ui::FindAndReplaceUi
+class FindAndReplaceWidget : public QTabWidget, public Ui::FindAndReplaceUi
 {
 	Q_OBJECT
 
diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 6279af9ffd..28759e856e 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -1,373 +1,308 @@
 <ui version="4.0">
  <class>FindAndReplaceUi</class>
- <widget class="QWidget" name="FindAndReplaceUi">
+ <widget class="QTabWidget" name="FindAndReplaceUi">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>247</width>
-    <height>341</height>
+    <width>234</width>
+    <height>262</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Find LyX Text</string>
+   <string>TabWidget</string>
   </property>
-  <property name="toolTip">
-   <string/>
+  <property name="currentIndex">
+   <number>0</number>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
-   <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="BasicTab">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+  <widget class="QWidget" name="basicTab">
+   <attribute name="title">
+    <string>Basi&amp;c</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>&amp;Find:</string>
       </property>
-      <property name="focusPolicy">
-       <enum>Qt::NoFocus</enum>
+      <property name="buddy">
+       <cstring>find_work_area_</cstring>
       </property>
-      <property name="toolTip">
-       <string/>
-      </property>
-      <property name="statusTip">
-       <string/>
-      </property>
-      <attribute name="title">
-       <string>Basi&amp;c</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>&amp;Find:</string>
-         </property>
-         <property name="buddy">
-          <cstring>find_work_area_</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="lyx::frontend::EmbeddedWorkArea" name="find_work_area_">
-         <property name="toolTip">
-          <string>Enter the text to search for in this full-featured LyX editing area</string>
-         </property>
-         <widget class="QWidget" name="find_scroll_area_">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>192</width>
-            <height>57</height>
-           </rect>
-          </property>
-         </widget>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Replace &amp;with:</string>
-         </property>
-         <property name="buddy">
-          <cstring>replace_work_area_</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="2">
-        <widget class="lyx::frontend::EmbeddedWorkArea" name="replace_work_area_">
-         <property name="toolTip">
-          <string>Enter the text to replace in this full-featured LyX editing area</string>
-         </property>
-         <widget class="QWidget" name="replace_scroll_area_">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>202</width>
-            <height>57</height>
-           </rect>
-          </property>
-         </widget>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="caseCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Perform a case-sensitive search</string>
-         </property>
-         <property name="text">
-          <string>Case &amp;sensitive</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QPushButton" name="findNextPB">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>Find next occurrence [Enter]</string>
-         </property>
-         <property name="text">
-          <string>Find &amp;Next</string>
-         </property>
-         <property name="default">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QCheckBox" name="wordsCB">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>Restrict search to whole words only</string>
-         </property>
-         <property name="text">
-          <string>W&amp;hole words</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <widget class="QPushButton" name="replacePB">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>Replace and find next occurrence [Enter]</string>
-         </property>
-         <property name="text">
-          <string>&amp;Replace</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QCheckBox" name="searchbackCB">
-         <property name="text">
-          <string>Search &amp;backwards</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <widget class="QPushButton" name="replaceallPB">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="toolTip">
-          <string>Replace all occurences at once</string>
-         </property>
-         <property name="text">
-          <string>Replace &amp;All</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
      </widget>
-     <widget class="QWidget" name="AdvancedTab">
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="lyx::frontend::EmbeddedWorkArea" name="find_work_area_" native="true">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Replace &amp;with:</string>
+      </property>
+      <property name="buddy">
+       <cstring>replace_work_area_</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0" colspan="2">
+     <widget class="lyx::frontend::EmbeddedWorkArea" name="replace_work_area_" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0">
+     <widget class="QCheckBox" name="caseCB">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="toolTip">
-       <string/>
+       <string>Perform a case-sensitive search</string>
       </property>
-      <property name="statusTip">
-       <string/>
+      <property name="text">
+       <string>Case &amp;sensitive</string>
       </property>
-      <attribute name="title">
-       <string>Ad&amp;vanced</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="0" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_2">
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <widget class="QPushButton" name="findNextPB">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="toolTip">
+       <string>Find next occurrence [Enter]</string>
+      </property>
+      <property name="text">
+       <string>Find &amp;Next</string>
+      </property>
+      <property name="default">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="0">
+     <widget class="QCheckBox" name="wordsCB">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="toolTip">
+       <string>Restrict search to whole words only</string>
+      </property>
+      <property name="text">
+       <string>W&amp;hole words</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1">
+     <widget class="QPushButton" name="replacePB">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="toolTip">
+       <string>Replace and find next occurrence [Enter]</string>
+      </property>
+      <property name="text">
+       <string>&amp;Replace</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="0">
+     <widget class="QCheckBox" name="searchbackCB">
+      <property name="text">
+       <string>Search &amp;backwards</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="1">
+     <widget class="QPushButton" name="replaceallPB">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="toolTip">
+       <string>Replace all occurences at once</string>
+      </property>
+      <property name="text">
+       <string>Replace &amp;All</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="advancedTab">
+   <attribute name="title">
+    <string>Ad&amp;vanced</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0" colspan="2">
+     <widget class="QGroupBox" name="groupBox_2">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="toolTip">
+       <string>The scope to which the search horizon is restricted</string>
+      </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
+      <property name="title">
+       <string>Sco&amp;pe</string>
+      </property>
+      <property name="flat">
+       <bool>false</bool>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QRadioButton" name="CurrentParagraph">
          <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>The scope to which the search horizon is restricted</string>
-         </property>
-         <property name="autoFillBackground">
           <bool>false</bool>
          </property>
-         <property name="title">
-          <string>Sco&amp;pe</string>
-         </property>
-         <property name="flat">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QRadioButton" name="CurrentParagraph">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>Current paragraph</string>
-            </property>
-            <property name="text">
-             <string>Current &amp;paragraph</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="CurrentDocument">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>Current &amp;document</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="MasterDocument">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>Current document and all related documents belonging to the same master document</string>
-            </property>
-            <property name="text">
-             <string>&amp;Master document</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="OpenDocuments">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="toolTip">
-             <string>All open documents</string>
-            </property>
-            <property name="text">
-             <string>&amp;Open documents</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="AllManualsRB">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>All ma&amp;nuals</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="ignoreFormatCB">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
          <property name="toolTip">
-          <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
+          <string>Current paragraph</string>
          </property>
          <property name="text">
-          <string>Ignore &amp;format</string>
+          <string>Current &amp;paragraph</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="CurrentDocument">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string>Current &amp;document</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
-        <widget class="QCheckBox" name="keepCaseCB">
-         <property name="toolTip">
-          <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
-         </property>
-         <property name="text">
-          <string>&amp;Preserve first case on replace</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="expandMacrosCB">
+       <item>
+        <widget class="QRadioButton" name="MasterDocument">
          <property name="enabled">
-          <bool>false</bool>
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Current document and all related documents belonging to the same master document</string>
          </property>
          <property name="text">
-          <string>&amp;Expand macros</string>
+          <string>&amp;Master document</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+       <item>
+        <widget class="QRadioButton" name="OpenDocuments">
+         <property name="enabled">
+          <bool>true</bool>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>13</width>
-           <height>168</height>
-          </size>
+         <property name="toolTip">
+          <string>All open documents</string>
          </property>
-        </spacer>
+         <property name="text">
+          <string>&amp;Open documents</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="AllManualsRB">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string>All ma&amp;nuals</string>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>
-    </widget>
-   </item>
-  </layout>
+    </item>
+    <item row="1" column="0">
+     <widget class="QCheckBox" name="ignoreFormatCB">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="toolTip">
+       <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
+      </property>
+      <property name="text">
+       <string>Ignore &amp;format</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0" colspan="2">
+     <widget class="QCheckBox" name="keepCaseCB">
+      <property name="toolTip">
+       <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
+      </property>
+      <property name="text">
+       <string>&amp;Preserve first case on replace</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0">
+     <widget class="QCheckBox" name="expandMacrosCB">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="text">
+       <string>&amp;Expand macros</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>105</width>
+        <height>2</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>lyx::frontend::EmbeddedWorkArea</class>
-   <extends>QScrollArea</extends>
-   <header location="global">GuiWorkArea.h</header>
+   <extends>QWidget</extends>
+   <header>GuiWorkArea.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">qt_helpers.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>