diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 681f65b19e..7122fe14fa 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -190,7 +190,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.destination_field.addItems(fields)
         self.destination_field.setMaxVisibleItems(min(len(fields), 20))
         offset = 10
-        self.s_r_number_of_books = min(7, len(self.ids))
+        self.s_r_number_of_books = min(10, len(self.ids))
         for i in range(1,self.s_r_number_of_books+1):
             w = QtGui.QLabel(self.tabWidgetPage3)
             w.setText(_('Book %d:')%i)
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index ec5a952346..f28f3fb57c 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -319,7 +319,7 @@ Future conversion of these books will use the default settings.</string>
         <attribute name="title">
          <string>&amp;Search and replace (experimental)</string>
         </attribute>
-        <layout class="QGridLayout" name="testgrid">
+        <layout class="QGridLayout" name="vargrid">
          <property name="sizeConstraint">
           <enum>QLayout::SetMinimumSize</enum>
          </property>
@@ -406,6 +406,12 @@ Future conversion of these books will use the default settings.</string>
            <property name="toolTip">
             <string>Enter the what you are looking for, either plain text or a regular expression, depending on the mode</string>
            </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>100</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
           </widget>
          </item>
          <item row="4" column="2">
@@ -558,19 +564,33 @@ nothing should be put between the original text and the inserted text</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="0">
-          <widget class="QLabel" name="label_31">
-           <property name="text">
-            <string>Your test:</string>
+         <item row="9" column="0" colspan="4">
+          <widget class="QScrollArea" name="scrollArea11">
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
            </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="gridLayoutWidget_2">
+            <layout class="QGridLayout" name="testgrid">
+             <item row="8" column="0">
+              <widget class="QLabel" name="label_31">
+               <property name="text">
+                <string>Your test:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="8" column="1">
+              <widget class="HistoryLineEdit" name="test_text"/>
+             </item>
+             <item row="8" column="2">
+              <widget class="QLineEdit" name="test_result"/>
+             </item>
+            </layout>
+           </widget>
           </widget>
          </item>
-         <item row="8" column="1">
-          <widget class="HistoryLineEdit" name="test_text"/>
-         </item>
-         <item row="8" column="2">
-          <widget class="QLineEdit" name="test_result"/>
-         </item>
          <item row="20" column="1">
           <spacer name="verticalSpacer">
            <property name="orientation">