diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index bae3297182..b98059e805 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -18,6 +18,10 @@
 
 * Ctrl-click on a cross-reference will now take you to its label.
 
+* Default shortcuts for saving bookmarks have been changed to Alt-NUM, where
+  NUM is the number of the bookmark. (They were previously Shift-F1, etc.) This
+  allows Shift-F3 to be used for word-find-backwards (i.e., find previous).
+
 
 !!Documents compilation process and images conversion
 
diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index 28c8ae6124..89de21e7b4 100644
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -126,8 +126,6 @@ void GuiSearchWidget::minimizeClicked(bool const toggle)
 	replacePB->setHidden(minimized_);
 	replacePrevPB->setHidden(minimized_);
 	replaceallPB->setHidden(minimized_);
-	wordsCB->setHidden(minimized_);
-	caseCB->setHidden(minimized_);
 	CBGroupBox->setHidden(minimized_);
 	if (minimized_) {
 		minimizePB->setText(qt_("Ex&pand"));
diff --git a/src/frontends/qt/ui/SearchUi.ui b/src/frontends/qt/ui/SearchUi.ui
index 5fea415ad5..8637da8f21 100644
--- a/src/frontends/qt/ui/SearchUi.ui
+++ b/src/frontends/qt/ui/SearchUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>706</width>
-    <height>121</height>
+    <height>127</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -194,55 +194,46 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="CBGroupBox">
      <layout class="QHBoxLayout" name="CBLayout">
       <item>
-       <widget class="QCheckBox" name="caseCB">
-        <property name="text">
-         <string>&amp;Case sensitive[[search]]</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="wordsCB">
-        <property name="text">
-         <string>Match &amp;whole words only</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="caseCB">
+          <property name="text">
+           <string>&amp;Case sensitive[[search]]</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="wordsCB">
+          <property name="text">
+           <string>Match &amp;whole words only</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="2" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout"/>
+   </item>
   </layout>
  </widget>
  <includes>