diff --git a/src/qtgui/snippets.ui b/src/qtgui/snippets.ui
index 253ccf8d..18fd8c71 100644
--- a/src/qtgui/snippets.ui
+++ b/src/qtgui/snippets.ui
@@ -13,9 +13,9 @@
   <property name="windowTitle">
    <string>Snippets</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QWebView" name="browser">
        <property name="url">
@@ -26,88 +26,104 @@
       </widget>
      </item>
      <item>
-      <widget class="QFrame" name="searchFM">
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QToolButton" name="searchClosePB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QFrame" name="searchFM">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="topMargin">
+           <number>1</number>
           </property>
-          <property name="text">
-           <string notr="true">X</string>
+          <property name="bottomMargin">
+           <number>1</number>
           </property>
-          <property name="toolButtonStyle">
-           <enum>Qt::ToolButtonTextOnly</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="searchLB">
-          <property name="text">
-           <string>Find:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="searchLE">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="nextPB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Next</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="prevPB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Prev</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+          <item>
+           <widget class="QToolButton" name="searchClosePB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string notr="true">X</string>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextOnly</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="searchLB">
+            <property name="text">
+             <string>Find:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="searchLE">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="nextPB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Next</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="prevPB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Prev</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Close</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -119,22 +135,6 @@
  </customwidgets>
  <resources/>
  <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>clicked(QAbstractButton*)</signal>
-   <receiver>Snippets</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>257</x>
-     <y>369</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>257</x>
-     <y>197</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>searchClosePB</sender>
    <signal>clicked()</signal>
diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp
index 27766eca..d2428c20 100644
--- a/src/qtgui/snippets_w.cpp
+++ b/src/qtgui/snippets_w.cpp
@@ -64,17 +64,29 @@ void SnippetsW::init()
     if (m_source.isNull())
 	return;
 
+    QPushButton *searchButton = new QPushButton(tr("Search"));
+    searchButton->setAutoDefault(false);
+    buttonBox->addButton(searchButton, QDialogButtonBox::ActionRole);
+
     searchFM->hide();
 
     new QShortcut(QKeySequence::Find, this, SLOT(slotEditFind()));
     new QShortcut(QKeySequence(Qt::Key_Slash), this, SLOT(slotEditFind()));
+    new QShortcut(QKeySequence(Qt::Key_Escape), searchFM, SLOT(hide()));
     new QShortcut(QKeySequence::FindNext, this, SLOT(slotEditFindNext()));
+    new QShortcut(QKeySequence(Qt::Key_F3), this, SLOT(slotEditFindNext()));
     new QShortcut(QKeySequence::FindPrevious, this, 
 		  SLOT(slotEditFindPrevious()));
+    new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F3), 
+		  this, SLOT(slotEditFindPrevious()));
+
+    QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
+    if (closeButton)
+	connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(searchButton, SIGNAL(clicked()), this, SLOT(slotEditFind()));
     connect(searchLE, SIGNAL(textChanged(const QString&)), 
 	    this, SLOT(slotSearchTextChanged(const QString&)));
     connect(nextPB, SIGNAL(clicked()), this, SLOT(slotEditFindNext()));
-    new QShortcut(QKeySequence(Qt::Key_F3), this, SLOT(slotEditFindNext()));
     connect(prevPB, SIGNAL(clicked()), this, SLOT(slotEditFindPrevious()));
 
 #ifdef SNIPPETS_WEBKIT